Merge branch 'master' into asmjit

src/hwrenderer/scene/hw_flats.cpp

@@ -182,7 +182,7 @@ void GLFlat::SetupLights(HWDrawInfo *di, FLightNode * node, FDynLightData &light
 
 void GLFlat::DrawSubsectors(HWDrawInfo *di, FRenderState &state)
 {
-	if (level.HasDynamicLights && screen->BuffersArePersistent())
+	if (level.HasDynamicLights && screen->BuffersArePersistent() && !di->isFullbrightScene())
 	{
 		SetupLights(di, section->lighthead, lightdata, sector->PortalGroup);
 	}
@@ -375,7 +375,7 @@ inline void GLFlat::PutFlat(HWDrawInfo *di, bool fog)
 	}
 	else if (!screen->BuffersArePersistent())
 	{
-		if (level.HasDynamicLights && gltexture != nullptr && !(hacktype & (SSRF_PLANEHACK|SSRF_FLOODHACK)) )
+		if (level.HasDynamicLights && gltexture != nullptr && !di->isFullbrightScene() && !(hacktype & (SSRF_PLANEHACK|SSRF_FLOODHACK)) )
 		{
 			SetupLights(di, section->lighthead, lightdata, sector->PortalGroup);
 		}

src/hwrenderer/scene/hw_sprites.cpp

@@ -94,7 +94,7 @@ void GLSprite::DrawSprite(HWDrawInfo *di, FRenderState &state, bool translucent)
 			gl_usecolorblending && !di->isFullbrightScene() && actor &&
 			fullbright && gltexture && !gltexture->tex->GetTranslucency())
 		{
-			RenderStyle = LegacyRenderStyles[STYLE_ColorBlend];
+			RenderStyle = LegacyRenderStyles[STYLE_ColorAdd];
 		}
 
 		state.SetRenderStyle(RenderStyle);

src/namedef.h

@@ -46,6 +46,9 @@ xx(Shadow)
 xx(Subtract)
 xx(Subtractive)
 xx(FillColor)
+xx(ColorBlend)
+xx(ColorAdd)
+xx(Multiply)
 
 // Healingradius types
 xx(Mana)

src/p_mobj.cpp

@@ -8587,7 +8587,7 @@ void PrintMiscActorInfo(AActor *query)
 		/*for (flagi = 0; flagi < 31; flagi++)
 			if (query->BounceFlags & 1<<flagi) Printf(" %s", flagnamesb[flagi]);*/
 		Printf("\nRender style = %i:%s, alpha %f\nRender flags: %x", 
-			querystyle, (querystyle < STYLE_Count ? renderstyles[querystyle] : "Unknown"),
+			querystyle, (querystyle < countof(renderstyles) ? renderstyles[querystyle] : "Custom"),
 			query->Alpha, query->renderflags.GetValue());
 		/*for (flagi = 0; flagi < 31; flagi++)
 			if (query->renderflags & 1<<flagi) Printf(" %s", flagnamesr[flagi]);*/

src/p_udmf.cpp

@@ -739,6 +739,15 @@ public:
 				case NAME_Subtractive:
 					th->RenderStyle = STYLE_Subtract;
 					break;
+				case NAME_ColorBlend:
+					th->RenderStyle = STYLE_ColorBlend;
+					break;
+				case NAME_ColorAdd:
+					th->RenderStyle = STYLE_ColorAdd;
+					break;
+				case NAME_Multiply:
+					th->RenderStyle = STYLE_Multiply;
+					break;
 				default:
 					break;
 				}

src/r_data/renderstyle.cpp

@@ -62,6 +62,7 @@ FRenderStyle LegacyRenderStyles[STYLE_Count] =
 	{ { STYLEOP_Add, STYLEALPHA_InvDstCol, STYLEALPHA_Zero, 0 } },										/* STYLE_InverseMultiply */
 	{ { STYLEOP_Add, STYLEALPHA_SrcCol, STYLEALPHA_InvSrcCol, 0 } },									/* STYLE_ColorBlend */
 	{ { STYLEOP_Add, STYLEALPHA_One, STYLEALPHA_Zero, 0 } },											/* STYLE_Source */
+	{ { STYLEOP_Add, STYLEALPHA_SrcCol, STYLEALPHA_One, 0 } },											/* STYLE_ColorAdd */
 };
 
 double GetAlpha(int type, double alpha)

src/r_data/renderstyle.h

@@ -78,6 +78,7 @@ enum ERenderStyle
 	STYLE_InverseMultiply,	// Multiply source with inverse of destination (HW renderer only.)
 	STYLE_ColorBlend,		// Use color intensity as transparency factor
 	STYLE_Source,			// No blending (only used internally)
+	STYLE_ColorAdd,			// Use color intensity as transparency factor and blend additively.
 
 	STYLE_Count
 };

src/scripting/thingdef_properties.cpp

@@ -700,12 +700,14 @@ DEFINE_PROPERTY(renderstyle, S, Actor)
 	PROP_STRING_PARM(str, 0);
 	static const char * renderstyles[]={
 		"NONE", "NORMAL", "FUZZY", "SOULTRANS", "OPTFUZZY", "STENCIL", 
-		"TRANSLUCENT", "ADD", "SHADED", "SHADOW", "SUBTRACT", "ADDSTENCIL", "ADDSHADED", NULL };
+		"TRANSLUCENT", "ADD", "SHADED", "SHADOW", "SUBTRACT", "ADDSTENCIL", 
+		"ADDSHADED", "COLORBLEND", "COLORADD", "MULTIPLY", NULL };
 
 	static const int renderstyle_values[]={
 		STYLE_None, STYLE_Normal, STYLE_Fuzzy, STYLE_SoulTrans, STYLE_OptFuzzy,
 			STYLE_TranslucentStencil, STYLE_Translucent, STYLE_Add, STYLE_Shaded,
-			STYLE_Shadow, STYLE_Subtract, STYLE_AddStencil, STYLE_AddShaded};
+			STYLE_Shadow, STYLE_Subtract, STYLE_AddStencil, STYLE_AddShaded,
+			STYLE_ColorBlend, STYLE_ColorAdd, STYLE_Multiply};
 
 	// make this work for old style decorations, too.
 	if (!strnicmp(str, "style_", 6)) str+=6;