Improved behavior on the edge of the region when corrections are disa…

…bled Don't let unset indices from the WangId based on surroundings override colors from currently present tiles.
mapeditor · Jul 6, 2023 · 781c74d · 781c74d
1 parent 73f0fcf
commit 781c74d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/tiled/wangfiller.cpp b/src/tiled/wangfiller.cpp
@@ -210,8 +210,10 @@ void WangFiller::apply(TileLayer &target)
             const WangId surroundings = wangIdFromSurroundings(QPoint(x, y));
             CellInfo &info = grid.add(x, y);
 
-            // Don't override explicitly set indexes
-            info.desired.mergeWith(surroundings, mask & ~info.mask);
+            // Don't override explicitly set indexes and don't override with
+            // unset indices from surroundings.
+            mask &= ~(info.mask | surroundings.mask(WangId::INDEX_MASK));
+            info.desired.mergeWith(surroundings, mask);
         };
 
         for (const QRect &rect : region) {