Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_outliner / outliner_edit.c
index f28e70a112e2585d07846151c031329447f7d02b..4e0686146fbaac6b7027d702cdff19bc268eb9e6 100644 (file)
@@ -285,7 +285,7 @@ static void do_item_rename(const Scene *scene, ARegion *ar, TreeElement *te, Tre
                        add_textbut = true;
                }
        }
-       else if (ID_IS_LINKED_DATABLOCK(tselem->id)) {
+       else if (ID_IS_LINKED(tselem->id)) {
                BKE_report(reports, RPT_WARNING, "Cannot edit external libdata");
        }
        else if (te->idcode == ID_LI && ((Library *)tselem->id)->parent) {
@@ -480,7 +480,7 @@ static int outliner_id_remap_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        }
 
-       if (ID_IS_LINKED_DATABLOCK(old_id)) {
+       if (ID_IS_LINKED(old_id)) {
                BKE_reportf(op->reports, RPT_WARNING,
                            "Old ID '%s' is linked from a library, indirect usages of this data-block will not be remapped",
                            old_id->name);
@@ -1898,7 +1898,7 @@ static int parent_drop_exec(bContext *C, wmOperator *op)
        RNA_string_get(op->ptr, "child", childname);
        ob = (Object *)BKE_libblock_find_name(ID_OB, childname);
 
-       if (ID_IS_LINKED_DATABLOCK(ob)) {
+       if (ID_IS_LINKED(ob)) {
                BKE_report(op->reports, RPT_INFO, "Can't edit library linked object");
                return OPERATOR_CANCELLED;
        }
@@ -1960,7 +1960,7 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
                if (ob == par) {
                        return OPERATOR_CANCELLED;
                }
-               if (ID_IS_LINKED_DATABLOCK(ob)) {
+               if (ID_IS_LINKED(ob)) {
                        BKE_report(op->reports, RPT_INFO, "Can't edit library linked object");
                        return OPERATOR_CANCELLED;
                }
@@ -2155,7 +2155,7 @@ static int scene_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
                RNA_string_get(op->ptr, "object", obname);
                ob = (Object *)BKE_libblock_find_name(ID_OB, obname);
 
-               if (ELEM(NULL, ob, scene) || ID_IS_LINKED_DATABLOCK(scene)) {
+               if (ELEM(NULL, ob, scene) || ID_IS_LINKED(scene)) {
                        return OPERATOR_CANCELLED;
                }