Merge branch 'master' into blender2.8
[blender.git] / source / blender / gpu / intern / gpu_material.c
index 2bded95a1b5df044f9755f069b70b6ca241fc188..b2e479043d22a42c03b0cf606a83838858d85345 100644 (file)
@@ -207,6 +207,9 @@ static void gpu_material_set_attrib_id(GPUMaterial *material)
                BLI_snprintf(name, sizeof(name), "att%d", attribs->layer[a].attribid);
                attribs->layer[a].glindex = GPU_shader_get_attribute(shader, name);
 
+               BLI_snprintf(name, sizeof(name), "att%d_info", attribs->layer[a].attribid);
+               attribs->layer[a].glinfoindoex = GPU_shader_get_uniform(shader, name);
+
                if (attribs->layer[a].glindex >= 0) {
                        attribs->layer[b] = attribs->layer[a];
                        b++;