From 4ccd5a78d18f80177a25ca3b79cdb80e697126d4 Mon Sep 17 00:00:00 2001 From: "R. Timothy Edwards" Date: Fri, 2 Jan 2026 19:54:08 -0500 Subject: [PATCH] Corrected a couple of lines in the paint code that had been improperly messed with during a commit back in August. At the time I was unsure of what to do with those lines, but now I'm quite sure they were correct to have been commented out. I have now removed them so that they should not cause trouble in the future. Quick explanation: After a non-Manhattan tile 4-way split, merging should be done to the left conditionally on the merge flags (the latter part of that being the August 1 fix), but merging should never be done to the right because the right side is still fractured and has yet to be visited. The merging will eventually get handled. Whether the merge flag has been set or not does not matter. --- VERSION | 2 +- database/DBpaint.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/VERSION b/VERSION index bdc71b53..91a1a6ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.3.587 +8.3.588 diff --git a/database/DBpaint.c b/database/DBpaint.c index cee0068d..dd8cbdc6 100644 --- a/database/DBpaint.c +++ b/database/DBpaint.c @@ -487,8 +487,6 @@ enumerate: newType = (method == (unsigned char)PAINT_XOR) ? *resultTbl : resultTbl[oldType]; - if (mergeFlags & MRG_RIGHT) - tile = TiNMMergeRight(tile, plane); // was commented out? if (mergeFlags & MRG_LEFT) TiNMMergeLeft(LB(newtile), plane); } @@ -496,8 +494,6 @@ enumerate: { if (mergeFlags & MRG_LEFT) TiNMMergeLeft(newtile, plane); - if (mergeFlags & MRG_RIGHT) - TiNMMergeRight(LB(tile), plane); // was commented out? } } else