Fix regression with same-texture-selection in Visual Mode.

This commit is contained in:
sphere 2021-04-03 23:51:29 +02:00
parent 8b6406075c
commit f63047400d

View file

@ -632,16 +632,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
//mxd //mxd
private void SelectNeighbourSideParts(Sidedef side, Rectangle sourcerect, bool select, bool matchtexture, bool matchheight, bool forward) private void SelectNeighbourSideParts(Sidedef side, Rectangle sourcerect, bool select, bool matchtexture, bool matchheight, bool forward)
{ {
if (side.Line.Marked)
return;
BaseVisualSector s = (BaseVisualSector)mode.GetVisualSector(side.Sector); BaseVisualSector s = (BaseVisualSector)mode.GetVisualSector(side.Sector);
if(s != null) if(s != null)
{ {
VisualSidedefParts parts = s.GetSidedefParts(side); VisualSidedefParts parts = s.GetSidedefParts(side);
SelectNeighbourSidePart(parts.lower, sourcerect, select, matchtexture, matchheight, forward); SelectNeighbourSidePart(parts.lower, sourcerect, select, matchtexture, matchheight, forward);
SelectNeighbourSidePart(parts.middlesingle, sourcerect, select, matchtexture, matchheight, forward); SelectNeighbourSidePart(parts.middlesingle, sourcerect, select, matchtexture, matchheight, forward);
SelectNeighbourSidePart(parts.middledouble, sourcerect, select, matchtexture, matchheight, forward);
SelectNeighbourSidePart(parts.upper, sourcerect, select, matchtexture, matchheight, forward); SelectNeighbourSidePart(parts.upper, sourcerect, select, matchtexture, matchheight, forward);
if(parts.middle3d != null) if(parts.middle3d != null)
@ -649,6 +646,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
foreach(VisualMiddle3D middle3D in parts.middle3d) foreach(VisualMiddle3D middle3D in parts.middle3d)
SelectNeighbourSidePart(middle3D, sourcerect, select, matchtexture, matchheight, forward); SelectNeighbourSidePart(middle3D, sourcerect, select, matchtexture, matchheight, forward);
} }
// hack to prevent midtexture selection wrapping arround
if (side.Line.Marked)
return;
SelectNeighbourSidePart(parts.middledouble, sourcerect, select, matchtexture, matchheight, forward);
} }
} }