diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
commit | 91af8f2ae2b5238839b57eaf74b0f950259ec57a (patch) | |
tree | 1e7e775c9830041457cbb5771804b8bddfbeee3a /source/blender/editors/screen/screen_ops.c | |
parent | 9d77b5d5910b65bed88817169d5444cfb189eb63 (diff) | |
parent | 66a6d160fe26c1bac7a5dd4cd26cb5fbd5cf348e (diff) |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/device/device.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/windowmanager/intern/wm_files_link.c
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 9352fcc76f7..c02733d26bd 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -171,7 +171,7 @@ int ED_operator_screen_mainwinactive(bContext *C) int ED_operator_scene_editable(bContext *C) { Scene *scene = CTX_data_scene(C); - if (scene && !ID_IS_LINKED_DATABLOCK(scene)) + if (scene && !ID_IS_LINKED(scene)) return 1; return 0; } @@ -181,7 +181,7 @@ int ED_operator_objectmode(bContext *C) Scene *scene = CTX_data_scene(C); Object *obact = CTX_data_active_object(C); - if (scene == NULL || ID_IS_LINKED_DATABLOCK(scene)) + if (scene == NULL || ID_IS_LINKED(scene)) return 0; if (CTX_data_edit_object(C)) return 0; @@ -282,7 +282,7 @@ int ED_operator_node_editable(bContext *C) { SpaceNode *snode = CTX_wm_space_node(C); - if (snode && snode->edittree && !ID_IS_LINKED_DATABLOCK(snode->edittree)) + if (snode && snode->edittree && !ID_IS_LINKED(snode->edittree)) return 1; return 0; @@ -344,20 +344,20 @@ int ED_operator_object_active(bContext *C) int ED_operator_object_active_editable(bContext *C) { Object *ob = ED_object_active_context(C); - return ((ob != NULL) && !ID_IS_LINKED_DATABLOCK(ob) && !ed_object_hidden(ob)); + return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob)); } int ED_operator_object_active_editable_mesh(bContext *C) { Object *ob = ED_object_active_context(C); - return ((ob != NULL) && !ID_IS_LINKED_DATABLOCK(ob) && !ed_object_hidden(ob) && - (ob->type == OB_MESH) && !ID_IS_LINKED_DATABLOCK(ob->data)); + return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob) && + (ob->type == OB_MESH) && !ID_IS_LINKED(ob->data)); } int ED_operator_object_active_editable_font(bContext *C) { Object *ob = ED_object_active_context(C); - return ((ob != NULL) && !ID_IS_LINKED_DATABLOCK(ob) && !ed_object_hidden(ob) && + return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob) && (ob->type == OB_FONT)); } @@ -450,8 +450,8 @@ int ED_operator_posemode_local(bContext *C) if (ED_operator_posemode(C)) { Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); bArmature *arm = ob->data; - return !(ID_IS_LINKED_DATABLOCK(&ob->id) || - ID_IS_LINKED_DATABLOCK(&arm->id)); + return !(ID_IS_LINKED(&ob->id) || + ID_IS_LINKED(&arm->id)); } return false; } |