svn merge ^/trunk/blender -r42761:42776
[blender-staging.git] / source / blender / editors / interface / interface_templates.c
index 49e3ff10f06e183a8914ad0041988afde57b0ae1..b6c1606ec6baf62aa21d39dbcae830b14446ca8e 100644 (file)
@@ -2103,7 +2103,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
        name= (namebuf)? namebuf: "";
 
        /* hardcoded types */
-       if(itemptr->type == &RNA_MeshTextureFaceLayer || itemptr->type == &RNA_MeshColorLayer) {
+       if(itemptr->type == &RNA_MeshTexturePolyLayer || itemptr->type == &RNA_MeshLoopColorLayer) {
                uiItemL(sub, name, icon);
                uiBlockSetEmboss(block, UI_EMBOSSN);
                uiDefIconButR(block, TOG, 0, ICON_SCENE, 0, 0, UI_UNIT_X, UI_UNIT_Y, itemptr, "active_render", 0, 0, 0, 0, 0, NULL);