Conflicts were the two mesh/shader implementations meeting: kept the remote's newer complete version (typed shader uniforms, shader color uniform binding, mesh vertex editing defaults, status-bar shell stroke handling); deduped two identically-replayed RenderBackend methods. |
||
|---|---|---|
| .. | ||
| backend | ||
| context | ||
| preview | ||
| widget_host | ||
| boolean_ops.rs | ||
| canvas_view_stub.rs | ||
| lib.rs | ||
| widget_host.rs | ||