diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:41:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:41:49 +0300 |
| commit | ce3adc090d6cb380e345b0112079b01a61aa3544 (patch) | |
| tree | 807962bc12d15111c976a655de9c2b64aec0c7b3 /source/blender/editors/include/ED_armature.h | |
| parent | a3a76bc0fed3efa9d30ac5d0647a5449b7dcc38a (diff) | |
| parent | c963488b5e25b906ff72cbaabdcc76cbfbc77172 (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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 25e792535e0..0dcc4f32e43 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -205,9 +205,10 @@ 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_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); +bool ED_object_posemode_exit_ex(struct Main *bmain, struct Object *ob); +bool ED_object_posemode_exit(struct bContext *C, struct Object *ob); +bool ED_object_posemode_enter_ex(struct Main *bmain, struct Object *ob); +bool ED_object_posemode_enter(struct bContext *C, struct Object *ob); 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); |