diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-24 16:13:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-24 16:13:13 +0400 |
| commit | 385c72f5f26ae9c86bf40c127c44216ceea0e6c1 (patch) | |
| tree | 6c0432578abee5437adc94e96b5a91c593b866b4 /source/blender/editors/include/ED_armature.h | |
| parent | 5841d1c8145ba50addeb17fa0231705d949d8b3d (diff) | |
| parent | b5ce1b1a23a3befbcc4cd3c67a5ec6a76d77aa5a (diff) | |
Merged changes in the trunk up to revision 55546.
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript
Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
Diffstat (limited to 'source/blender/editors/include/ED_armature.h')
| -rw-r--r-- | source/blender/editors/include/ED_armature.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 310b60f13e8..3367dcb9c4c 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -123,8 +123,8 @@ void ED_armature_deselect_all(struct Object *obedit, int toggle); void ED_armature_deselect_all_visible(struct Object *obedit); int ED_do_pose_selectbuffer(struct Scene *scene, struct Base *base, unsigned int *buffer, - short hits, short extend, short deselect, short toggle); -int mouse_armature(struct bContext *C, const int mval[2], int extend, int deselect, int toggle); + short hits, bool extend, bool deselect, bool toggle); +bool mouse_armature(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle); int join_armature_exec(struct bContext *C, struct wmOperator *op); struct Bone *get_indexed_bone(struct Object *ob, int index); float ED_rollBoneToVector(EditBone *bone, const float new_up_axis[3], const short axis_only); |