Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / animation / keyframes_draw.c
index 8d7c32846b3c4fa3d7594ab34a71d434174be493..1ada20679297482dab2abed487f337fcb5075444 100644 (file)
@@ -705,7 +705,7 @@ void draw_fcurve_channel(View2D *v2d, AnimData *adt, FCurve *fcu, float ypos, fl
        
        bool locked = (fcu->flag & FCURVE_PROTECTED) ||
                      ((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED)) ||
-                     ((adt && adt->action) && ID_IS_LINKED_DATABLOCK(adt->action));
+                     ((adt && adt->action) && ID_IS_LINKED(adt->action));
        
        BLI_dlrbTree_init(&keys);
        BLI_dlrbTree_init(&blocks);
@@ -726,7 +726,7 @@ void draw_agroup_channel(View2D *v2d, AnimData *adt, bActionGroup *agrp, float y
        DLRBT_Tree keys, blocks;
        
        bool locked = (agrp->flag & AGRP_PROTECTED) ||
-                     ((adt && adt->action) && ID_IS_LINKED_DATABLOCK(adt->action));
+                     ((adt && adt->action) && ID_IS_LINKED(adt->action));
        
        BLI_dlrbTree_init(&keys);
        BLI_dlrbTree_init(&blocks);
@@ -746,7 +746,7 @@ void draw_action_channel(View2D *v2d, AnimData *adt, bAction *act, float ypos, f
 {
        DLRBT_Tree keys, blocks;
        
-       bool locked = (act && ID_IS_LINKED_DATABLOCK(act));
+       bool locked = (act && ID_IS_LINKED(act));
        
        BLI_dlrbTree_init(&keys);
        BLI_dlrbTree_init(&blocks);