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/armature/pose_lib.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/armature/pose_lib.c')
-rw-r--r-- | source/blender/editors/armature/pose_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 689d3010a7a..0dbe3ddaa0a 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -185,7 +185,7 @@ static int has_poselib_pose_data_poll(bContext *C) static int has_poselib_pose_data_for_editing_poll(bContext *C) { Object *ob = get_poselib_object(C); - return (ob && ob->poselib && !ID_IS_LINKED_DATABLOCK(ob->poselib)); + return (ob && ob->poselib && !ID_IS_LINKED(ob->poselib)); } /* ----------------------------------- */ @@ -387,7 +387,7 @@ static int poselib_add_poll(bContext *C) if (ED_operator_posemode(C)) { Object *ob = get_poselib_object(C); if (ob) { - if ((ob->poselib == NULL) || !ID_IS_LINKED_DATABLOCK(ob->poselib)) { + if ((ob->poselib == NULL) || !ID_IS_LINKED(ob->poselib)) { return true; } } |