mirror of
https://github.com/ZSeven-W/openpencil.git
synced 2026-09-28 16:12:57 +08:00
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.