[Bf-blender-cvs] [dab20bd41ff] master: Fix T54211: OpenGL debug error message in texture draw mode.

[Brecht Van Lommel]

Commit: dab20bd41ff9b2545952fa8715e2467b22900133
Author: Brecht Van Lommel
Date:   Sat Mar 3 14:55:35 2018 +0100
Branches: master
https://developer.blender.org/rBdab20bd41ff9b2545952fa8715e2467b22900133

Fix T54211: OpenGL debug error message in texture draw mode.

Quite harmless and won't be a problem in 2.8.

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

M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/editors/space_view3d/drawmesh.c

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 26aecb526d4..15469e3ae4b 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3910,17 +3910,25 @@ void DM_draw_attrib_vertex_uniforms(const DMVertexAttribs *attribs)
 {
 	int i;
 	if (attribs->totorco) {
-		glUniform1i(attribs->orco.gl_info_index, 0);
+		if (attribs->orco.gl_info_index != -1) {
+			glUniform1i(attribs->orco.gl_info_index, 0);
+		}
 	}
 	for (i = 0; i < attribs->tottface; i++) {
-		glUniform1i(attribs->tface[i].gl_info_index, 0);
+		if (attribs->tface[i].gl_info_index != -1) {
+			glUniform1i(attribs->tface[i].gl_info_index, 0);
+		}
 	}
 	for (i = 0; i < attribs->totmcol; i++) {
-		glUniform1i(attribs->mcol[i].gl_info_index, GPU_ATTR_INFO_SRGB);
+		if (attribs->mcol[i].gl_info_index != -1) {
+			glUniform1i(attribs->mcol[i].gl_info_index, GPU_ATTR_INFO_SRGB);
+		}
 	}
 
 	for (i = 0; i < attribs->tottang; i++) {
-		glUniform1i(attribs->tang[i].gl_info_index, 0);
+		if (attribs->tang[i].gl_info_index != -1) {
+			glUniform1i(attribs->tang[i].gl_info_index, 0);
+		}
 	}
 }
 
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index bbbf8c633bd..b6bcc592cc8 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -1115,6 +1115,7 @@ static void tex_mat_set_texture_cb(void *userData, int mat_nr, void *attribs)
 			gattribs->layer[0].type = CD_MTFACE;
 			gattribs->layer[0].name[0] = '\0';
 			gattribs->layer[0].gltexco = 1;
+			gattribs->layer[0].glinfoindoex = -1;
 			gattribs->totlayer = 1;
 
 			/* bind material */