diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
commit | b076b3853c99d947806e05fe2dec29ca5fa944fa (patch) | |
tree | 3d975903096066e33f8cfdcff60e118685deacf8 /source/blender/editors/armature | |
parent | ad5a20efcef8114b589ff66d09166eabdc8e67ad (diff) | |
parent | b88e51dd55c62bdc160f33f9b2ae1727a892560a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/armature_select.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_edit.c | 6 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_lib.c | 6 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_select.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index e295e1fd35a..ae2e7339c66 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -349,7 +349,7 @@ static int armature_select_linked_invoke(bContext *C, wmOperator *op, const wmEv return OPERATOR_FINISHED; } -static int armature_select_linked_poll(bContext *C) +static bool armature_select_linked_poll(bContext *C) { return (ED_operator_view3d_active(C) && ED_operator_editarmature(C)); } diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index b3775402a4b..661492ba056 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -294,7 +294,7 @@ void POSE_OT_paths_calculate(wmOperatorType *ot) /* --------- */ -static int pose_update_paths_poll(bContext *C) +static bool pose_update_paths_poll(bContext *C) { if (ED_operator_posemode_exclusive(C)) { Object *ob = CTX_data_active_object(C); @@ -773,7 +773,7 @@ void POSE_OT_rotation_mode_set(wmOperatorType *ot) /* ********************************************** */ -static int armature_layers_poll(bContext *C) +static bool armature_layers_poll(bContext *C) { /* Armature layers operators can be used in posemode OR editmode for armatures */ return ED_operator_posemode(C) || ED_operator_editarmature(C); @@ -1262,7 +1262,7 @@ static int toggle_bone_selection_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -static int pose_select_linked_poll(bContext *C) +static bool pose_select_linked_poll(bContext *C) { return (ED_operator_view3d_active(C) && ED_operator_posemode(C)); } diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 46663d7a771..2227bf33908 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -174,7 +174,7 @@ static Object *get_poselib_object(bContext *C) } /* Poll callback for operators that require existing PoseLib data (with poses) to work */ -static int has_poselib_pose_data_poll(bContext *C) +static bool has_poselib_pose_data_poll(bContext *C) { Object *ob = get_poselib_object(C); return (ob && ob->poselib); @@ -183,7 +183,7 @@ static int has_poselib_pose_data_poll(bContext *C) /* Poll callback for operators that require existing PoseLib data (with poses) * as they need to do some editing work on those poses (i.e. not on lib-linked actions) */ -static int has_poselib_pose_data_for_editing_poll(bContext *C) +static bool has_poselib_pose_data_for_editing_poll(bContext *C) { Object *ob = get_poselib_object(C); return (ob && ob->poselib && !ID_IS_LINKED(ob->poselib)); @@ -379,7 +379,7 @@ void POSELIB_OT_action_sanitize(wmOperatorType *ot) /* ------------------------------------------ */ /* Poll callback for adding poses to a PoseLib */ -static int poselib_add_poll(bContext *C) +static bool poselib_add_poll(bContext *C) { /* There are 2 cases we need to be careful with: * 1) When this operator is invoked from a hotkey, there may be no PoseLib yet diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index cafebb6ae95..72f0c68f660 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -390,7 +390,7 @@ static int pose_select_connected_invoke(bContext *C, wmOperator *op, const wmEve return OPERATOR_FINISHED; } -static int pose_select_linked_poll(bContext *C) +static bool pose_select_linked_poll(bContext *C) { return (ED_operator_view3d_active(C) && ED_operator_posemode(C)); } |