- added DTA_LegacyRenderStyle so that STYLE_* constants can be passed directly to the Draw functions.

- fixed the optional parameter in Shape2D.Clear.

(cherry picked from commit 7a692b1557)

# Conflicts:
#	src/v_2ddrawer.cpp
#	src/v_video.h
#	wadsrc/static/zscript/base.txt

src/v_draw.cpp

@@ -136,7 +136,7 @@ IMPLEMENT_CLASS(DShape2D, false, false)
 DEFINE_ACTION_FUNCTION(DShape2D, Clear)
 {
 	PARAM_SELF_PROLOGUE(DShape2D);
-	PARAM_INT(which);
+	PARAM_INT_DEF(which);
 
 	return 0;
 }
@@ -821,6 +821,10 @@ bool DCanvas::ParseDrawTextureTags(FTexture *img, double x, double y, uint32_t t
 			parms->style.AsDWORD = ListGetInt(tags);
 			break;
 
+		case DTA_LegacyRenderStyle:	// mainly for ZScript which does not handle FRenderStyle that well.
+			parms->style = (ERenderStyle)ListGetInt(tags);
+			break;
+
 		case DTA_SpecialColormap:
 			parms->specialcolormap = ListGetSpecialColormap(tags);
 			break;

src/v_video.h

@@ -129,6 +129,7 @@ enum
 
 	// New additions. 
 	DTA_Color,
+	DTA_LegacyRenderStyle,	// takes an old-style STYLE_* constant instead of an FRenderStyle
 };
 
 enum

wadsrc/static/zscript/base.txt

@@ -155,6 +155,9 @@ enum DrawTextureTags
 	DTA_TextLen,		// stop after this many characters, even if \0 not hit
 	DTA_CellX,			// horizontal size of character cell
 	DTA_CellY,			// vertical size of character cell
+
+	DTA_Color,
+	DTA_LegacyRenderStyle,	// takes an old-style STYLE_* constant instead of an FRenderStyle
 };
 
 class Shape2D : Object native