[Bf-blender-cvs] [554277986d4] blender2.8: Gawain: fix missing NULL check

[Campbell Barton]

Commit: 554277986d415dc62496942fb30838558a8c449d
Author: Campbell Barton
Date:   Tue Apr 18 15:02:06 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB554277986d415dc62496942fb30838558a8c449d

Gawain: fix missing NULL check

Also shadowed variable warning

===================================================================

M	intern/gawain/src/shader_interface.c

===================================================================

diff --git a/intern/gawain/src/shader_interface.c b/intern/gawain/src/shader_interface.c
index fe175d5e45b..2d0eb353aaf 100644
--- a/intern/gawain/src/shader_interface.c
+++ b/intern/gawain/src/shader_interface.c
@@ -209,8 +209,8 @@ ShaderInterface* ShaderInterface_create(GLint program)
 		if (delta)
 			{
 			// each input->name will need adjustment (except static built-in names)
-			const uint32_t input_ct = shaderface->uniform_ct + shaderface->attrib_ct;
-			for (uint32_t i = 0; i < input_ct; ++i)
+			const uint32_t input_ct_new = shaderface->uniform_ct + shaderface->attrib_ct;
+			for (uint32_t i = 0; i < input_ct_new; ++i)
 				{
 				ShaderInput* input = shaderface->inputs + i;
 
@@ -252,6 +252,9 @@ const ShaderInput* ShaderInterface_uniform(const ShaderInterface* shaderface, co
 		{
 		const ShaderInput* uniform = shaderface->inputs + i;
 
+#if SUPPORT_LEGACY_GLSL
+		if (uniform->name == NULL) continue;
+#endif
 		if (uniform->builtin_type != UNIFORM_CUSTOM)
 			if (match(uniform->name, name))
 				return uniform;