diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:02:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:02:32 +0300 |
| commit | debe3011f62e5935dc54d7033052d7d4e24ad449 (patch) | |
| tree | 4858e23ac7e2a49441e76e4ce6eddc2f74e766b7 /source/blender/editors/include/ED_armature.h | |
| parent | 1b78f05b1ca466695b39d4fd60570790c1ab9e13 (diff) | |
| parent | 32339a56f11ac1392c4b8d8651ff452a2a5511cc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_armature.h')
| -rw-r--r-- | source/blender/editors/include/ED_armature.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 0181cc20cdc..25e792535e0 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -205,8 +205,9 @@ void ED_armature_ebone_listbase_free(struct ListBase *lb); void ED_armature_ebone_listbase_copy(struct ListBase *lb_dst, struct ListBase *lb_src); /* poseobject.c */ -void ED_armature_exit_posemode(struct bContext *C, struct Base *base); -void ED_armature_enter_posemode(struct bContext *C, struct Base *base); +void ED_object_posemode_exit(struct bContext *C, struct Base *base); +bool ED_object_posemode_enter_ex(struct Main *bmain, struct Base *base); +bool ED_object_posemode_enter(struct bContext *C, struct Base *base); void ED_pose_de_selectall(struct Object *ob, int select_mode, const bool ignore_visibility); void ED_pose_bone_select(struct Object *ob, struct bPoseChannel *pchan, bool select); void ED_pose_recalculate_paths(struct bContext *C, struct Scene *scene, struct Object *ob); |