Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / interface / interface_templates.c
index ae2c691b9d8f39c82a682d41c6c41a6d6311d125..9cc0136ebdd057c3a33629c68ee932a03d80d227 100644 (file)
@@ -1245,7 +1245,7 @@ static uiLayout *draw_modifier(
                        }
                        
                        UI_block_lock_clear(block);
-                       UI_block_lock_set(block, ob && ID_IS_LINKED_DATABLOCK(ob), ERROR_LIBDATA_MESSAGE);
+                       UI_block_lock_set(block, ob && ID_IS_LINKED(ob), ERROR_LIBDATA_MESSAGE);
                        
                        if (!ELEM(md->type, eModifierType_Fluidsim, eModifierType_Softbody, eModifierType_ParticleSystem,
                                   eModifierType_Cloth, eModifierType_Smoke))
@@ -1292,7 +1292,7 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr)
                return NULL;
        }
        
-       UI_block_lock_set(uiLayoutGetBlock(layout), (ob && ID_IS_LINKED_DATABLOCK(ob)), ERROR_LIBDATA_MESSAGE);
+       UI_block_lock_set(uiLayoutGetBlock(layout), (ob && ID_IS_LINKED(ob)), ERROR_LIBDATA_MESSAGE);
        
        /* find modifier and draw it */
        cageIndex = modifiers_getCageIndex(scene, ob, &lastCageIndex, 0);
@@ -1520,7 +1520,7 @@ uiLayout *uiTemplateConstraint(uiLayout *layout, PointerRNA *ptr)
                return NULL;
        }
        
-       UI_block_lock_set(uiLayoutGetBlock(layout), (ob && ID_IS_LINKED_DATABLOCK(ob)), ERROR_LIBDATA_MESSAGE);
+       UI_block_lock_set(uiLayoutGetBlock(layout), (ob && ID_IS_LINKED(ob)), ERROR_LIBDATA_MESSAGE);
 
        /* hrms, the temporal constraint should not draw! */
        if (con->type == CONSTRAINT_TYPE_KINEMATIC) {
@@ -1882,7 +1882,7 @@ void uiTemplateColorRamp(uiLayout *layout, PointerRNA *ptr, const char *propname
        block = uiLayoutAbsoluteBlock(layout);
 
        id = cptr.id.data;
-       UI_block_lock_set(block, (id && ID_IS_LINKED_DATABLOCK(id)), ERROR_LIBDATA_MESSAGE);
+       UI_block_lock_set(block, (id && ID_IS_LINKED(id)), ERROR_LIBDATA_MESSAGE);
 
        colorband_buttons_layout(layout, block, cptr.data, &rect, cb, expand);
 
@@ -2542,7 +2542,7 @@ void uiTemplateCurveMapping(
        cb->prop = prop;
 
        id = cptr.id.data;
-       UI_block_lock_set(block, (id && ID_IS_LINKED_DATABLOCK(id)), ERROR_LIBDATA_MESSAGE);
+       UI_block_lock_set(block, (id && ID_IS_LINKED(id)), ERROR_LIBDATA_MESSAGE);
 
        curvemap_buttons_layout(layout, &cptr, type, levels, brush, neg_slope, cb);