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