griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-03-03 14:58:14 +01:00
parent 8d575899a1 dab20bd41f
commit 2adece9fbb
5 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3489,17 +3489,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);
}
}
}