blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

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

Quite harmless and won't be a problem in 2.8.
This commit is contained in:
Brecht Van Lommel 2018-03-03 14:55:35 +01:00
parent 94b99949eb
commit dab20bd41f
Notes: blender-bot 2023-02-14 06:08:59 +01:00 
Referenced by issue #54211, OpenGL Error Message
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -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);
}
}
}

1
source/blender/editors/space_view3d/drawmesh.c
View File

@ -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 */