omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align draw merge default comment

Browse Source
This commit is contained in:
omigamedev
2026-06-15 23:24:49 +02:00
parent 55a79ee436
commit abe1567413
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/modernization/debt.md
View File

@@ -413,6 +413,10 @@ agent or engineer to remove them without reconstructing context from chat.
`make_canvas_draw_merge_branch_dispatch(...)` forward declaration in `make_canvas_draw_merge_branch_dispatch(...)` forward declaration in
`src/canvas.cpp` now matches the 7-argument implementation, shrinking the `src/canvas.cpp` now matches the 7-argument implementation, shrinking the
remaining draw-merge helper API mismatch while `STR-016` stays blocked. remaining draw-merge helper API mismatch while `STR-016` stays blocked.
- 2026-06-15: `DEBT-0036` was narrowed again. The remaining
`Canvas::draw_merge()` inline-default comment in `src/canvas.cpp` now
matches the header's `SIXPLETTE(true)` default, so the draw-merge mismatch
is comment-only and aligned while `STR-016` stays blocked.
- 2026-06-14: `DEBT-0036` was narrowed again. `Canvas::draw_merge_branch_orchestration()` - 2026-06-14: `DEBT-0036` was narrowed again. `Canvas::draw_merge_branch_orchestration()`
now routes the temporary erase, temporary paint, texture, and blend dispatch now routes the temporary erase, temporary paint, texture, and blend dispatch
bodies through retained helpers inside `execute_canvas_draw_merge_branch_body(...)`; bodies through retained helpers inside `execute_canvas_draw_merge_branch_body(...)`;

3
docs/modernization/roadmap.md
View File

@@ -80,6 +80,9 @@ families debt-tracked.
The stale `make_canvas_draw_merge_branch_dispatch(...)` forward declaration in The stale `make_canvas_draw_merge_branch_dispatch(...)` forward declaration in
`src/canvas.cpp` now matches the existing 7-argument implementation, shrinking `src/canvas.cpp` now matches the existing 7-argument implementation, shrinking
the remaining draw-merge helper API mismatch while `STR-016` stays blocked. the remaining draw-merge helper API mismatch while `STR-016` stays blocked.
The remaining `Canvas::draw_merge()` inline-default comment in `src/canvas.cpp`
now matches the header's `SIXPLETTE(true)` default, so the draw-merge mismatch
is comment-only and aligned while `STR-016` stays blocked.
The cloud browser dialog now also opens through that seam from The cloud browser dialog now also opens through that seam from
`src/legacy_cloud_services.cpp`, so the remaining cloud modernization debt is `src/legacy_cloud_services.cpp`, so the remaining cloud modernization debt is
now concentrated in retained background worker threads, transfer helpers, now concentrated in retained background worker threads, transfer helpers,

2
src/canvas.cpp
View File

@@ -2226,7 +2226,7 @@ void Canvas::stroke_commit_timelapse()
} }
} }
void Canvas::draw_merge(bool draw_checkerboard, std::array<bool, 6> faces /*= SIXPLETTE(false)*/) void Canvas::draw_merge(bool draw_checkerboard, std::array<bool, 6> faces /*= SIXPLETTE(true)*/)
{ {
assert(App::I->is_render_thread()); assert(App::I->is_render_thread());