Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / cdderivedmesh.c
index 9c16399..249e4cc 100644 (file)
@@ -1020,6 +1020,7 @@ static void cdDM_drawMappedFacesGLSL(
 
                                if (matconv[a].attribs.totorco && matconv[a].attribs.orco.array) {
                                        matconv[a].datatypes[numdata].index = matconv[a].attribs.orco.gl_index;
+                                       matconv[a].datatypes[numdata].info_index = matconv[a].attribs.orco.gl_info_index;
                                        matconv[a].datatypes[numdata].size = 3;
                                        matconv[a].datatypes[numdata].type = GL_FLOAT;
                                        numdata++;
@@ -1027,6 +1028,7 @@ static void cdDM_drawMappedFacesGLSL(
                                for (b = 0; b < matconv[a].attribs.tottface; b++) {
                                        if (matconv[a].attribs.tface[b].array) {
                                                matconv[a].datatypes[numdata].index = matconv[a].attribs.tface[b].gl_index;
+                                               matconv[a].datatypes[numdata].info_index = matconv[a].attribs.tface[b].gl_info_index;
                                                matconv[a].datatypes[numdata].size = 2;
                                                matconv[a].datatypes[numdata].type = GL_FLOAT;
                                                numdata++;
@@ -1035,6 +1037,7 @@ static void cdDM_drawMappedFacesGLSL(
                                for (b = 0; b < matconv[a].attribs.totmcol; b++) {
                                        if (matconv[a].attribs.mcol[b].array) {
                                                matconv[a].datatypes[numdata].index = matconv[a].attribs.mcol[b].gl_index;
+                                               matconv[a].datatypes[numdata].info_index = matconv[a].attribs.mcol[b].gl_info_index;
                                                matconv[a].datatypes[numdata].size = 4;
                                                matconv[a].datatypes[numdata].type = GL_UNSIGNED_BYTE;
                                                numdata++;
@@ -1043,6 +1046,7 @@ static void cdDM_drawMappedFacesGLSL(
                                for (b = 0; b < matconv[a].attribs.tottang; b++) {
                                        if (matconv[a].attribs.tang[b].array) {
                                                matconv[a].datatypes[numdata].index = matconv[a].attribs.tang[b].gl_index;
+                                               matconv[a].datatypes[numdata].info_index = matconv[a].attribs.tang[b].gl_info_index;
                                                matconv[a].datatypes[numdata].size = 4;
                                                matconv[a].datatypes[numdata].type = GL_FLOAT;
                                                numdata++;