diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 2ac72c35..bfd198db 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -413,6 +413,10 @@ agent or engineer to remove them without reconstructing context from chat. `make_canvas_draw_merge_branch_dispatch(...)` forward declaration in `src/canvas.cpp` now matches the 7-argument implementation, shrinking the 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()` now routes the temporary erase, temporary paint, texture, and blend dispatch bodies through retained helpers inside `execute_canvas_draw_merge_branch_body(...)`; diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index 7a103349..1e7fd966 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -80,6 +80,9 @@ families debt-tracked. The stale `make_canvas_draw_merge_branch_dispatch(...)` forward declaration in `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 `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 `src/legacy_cloud_services.cpp`, so the remaining cloud modernization debt is now concentrated in retained background worker threads, transfer helpers, diff --git a/src/canvas.cpp b/src/canvas.cpp index c3d5511d..0032af22 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -2226,7 +2226,7 @@ void Canvas::stroke_commit_timelapse() } } -void Canvas::draw_merge(bool draw_checkerboard, std::array faces /*= SIXPLETTE(false)*/) +void Canvas::draw_merge(bool draw_checkerboard, std::array faces /*= SIXPLETTE(true)*/) { assert(App::I->is_render_thread());