Merge branch 'master' of https://github.com/coelckers/gzdoom

src/r_data/gldefs.cpp

@@ -1210,6 +1210,11 @@ class GLDefsParser
 		FTextureID no = TexMan.CheckForTexture(sc.String, type, FTextureManager::TEXMAN_TryAny | FTextureManager::TEXMAN_Overridable);
 		FTexture *tex = TexMan.GetTexture(no);
 
+		if (tex == nullptr)
+		{
+			sc.ScriptMessage("Material definition refers nonexistent texture '%s'\n", sc.String);
+		}
+
 		sc.MustGetToken('{');
 		while (!sc.CheckToken('}'))
 		{
@@ -1266,6 +1271,8 @@ class GLDefsParser
 					}
 				}
 				sc.MustGetString();
+				if (tex)
+				{
 					bool okay = false;
 					for (int i = 0; i < MAX_CUSTOM_HW_SHADER_TEXTURES; i++)
 					{
@@ -1274,7 +1281,7 @@ class GLDefsParser
 							tex->CustomShaderTextures[i] = TexMan.FindTexture(sc.String, ETextureType::Any, FTextureManager::TEXMAN_TryAny);
 							if (!tex->CustomShaderTextures[i])
 							{
-							sc.ScriptError("Custom hardware shader texture '%s' not found in texture '%s'\n", sc.String, tex ? tex->Name.GetChars() : "(null)");
+								sc.ScriptError("Custom hardware shader texture '%s' not found in texture '%s'\n", sc.String, tex->Name.GetChars());
 							}
 
 							texNameList.Push(textureName);
@@ -1285,7 +1292,8 @@ class GLDefsParser
 					}
 					if (!okay)
 					{
-					sc.ScriptError("Error: out of texture units in texture '%s'", tex ? tex->Name.GetChars() : "(null)");
+						sc.ScriptError("Error: out of texture units in texture '%s'", tex->Name.GetChars());
+					}
 				}
 			}
 			else if (sc.Compare("define"))