diff options
author | Ton Roosendaal <ton@blender.org> | 2005-07-23 22:52:31 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-07-23 22:52:31 +0400 |
commit | 948f27c0d888bbfe0f10c4350b4269166568b40d (patch) | |
tree | 2d582413b47bdddc8393c1815f8d7a1184bd4367 /source/blender/include | |
parent | 6e98a38ea2268fdd96acd6c280286001bca949f6 (diff) |
Killed silly modal PoseMode mode! :)
- PoseMode now is a state Armature Objects can be in. So, while in PoseMode
for an Armature, you can just select another Object or Armature.
- The old PoseMode options (transform, insert keys etc) are accessible
with making the Armature Object 'active' (and have object in PoseMode).
- At this moment no multiple Poses can be transformed/edited at the same
time.
- The old hotkey CTRL+TAB, and view3d header menu, still work to set an
Object's PoseMode
It was quite a lot recode, so tests & reports are welcome.
Oh, as a bonus I added Lasso Select for Bones in PoseMode! It selects using
only the line between root and tip of the Bone.
Diffstat (limited to 'source/blender/include')
-rw-r--r-- | source/blender/include/BDR_drawobject.h | 1 | ||||
-rw-r--r-- | source/blender/include/BIF_editarmature.h | 18 | ||||
-rw-r--r-- | source/blender/include/BIF_poseobject.h | 3 | ||||
-rw-r--r-- | source/blender/include/blendef.h | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h index 855331bfd73..02b12582b2a 100644 --- a/source/blender/include/BDR_drawobject.h +++ b/source/blender/include/BDR_drawobject.h @@ -46,7 +46,6 @@ struct BoundBox; struct Base; void init_draw_rects(void); -void helpline(float *vec); void drawaxes(float size); void drawcamera(struct Object *ob); diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h index da1a99314a3..7fc35197cfe 100644 --- a/source/blender/include/BIF_editarmature.h +++ b/source/blender/include/BIF_editarmature.h @@ -33,6 +33,7 @@ #define BIF_EDITARMATURE_H struct Object; +struct Base; struct Bone; struct bArmature; @@ -82,10 +83,12 @@ void clear_armature(struct Object *ob, char mode); void delete_armature(void); void deselectall_armature(int toggle); -void deselectall_posearmature (int test); -void draw_armature(struct Object *ob, int dt); +void deselectall_posearmature (struct Object *ob, int test); +void draw_armature(struct Base *base, int dt); void extrude_armature(void); void free_editArmature(void); +struct Bone *get_indexed_bone (struct Object *ob, int index); + void join_armature(void); void load_editArmature(void); @@ -94,7 +97,9 @@ void clear_bone_parent(void); void make_editArmature(void); void make_trans_bones (char mode); -void mousepose_armature(void); + +void do_pose_selectbuffer(struct Base *base, unsigned int *buffer, short hits); + void mouse_armature(void); void remake_editArmature(void); void selectconnected_armature(void); @@ -116,15 +121,14 @@ int bone_looper(Object *ob, struct Bone *bone, void *data, int (*bone_func)(Object *, struct Bone *, void *)); int ik_chain_looper(Object *ob, struct Bone *bone, void *data, int (*bone_func)(Object *, struct Bone *, void *)); -int is_delay_deform(void); void undo_push_armature(char *name); void armature_bone_rename(struct bArmature *arm, char *oldname, char *newname); -#define BONESEL_ROOT 0x02000000 -#define BONESEL_TIP 0x04000000 -#define BONESEL_BONE 0x08000000 +#define BONESEL_ROOT 0x10000000 +#define BONESEL_TIP 0x20000000 +#define BONESEL_BONE 0x40000000 #define BONESEL_ANY (BONESEL_TIP|BONESEL_ROOT|BONESEL_BONE) #define BONESEL_NOSEL 0x80000000 /* Indicates a negative number */ diff --git a/source/blender/include/BIF_poseobject.h b/source/blender/include/BIF_poseobject.h index 9859a2598ed..ac0c66ff0d1 100644 --- a/source/blender/include/BIF_poseobject.h +++ b/source/blender/include/BIF_poseobject.h @@ -46,9 +46,8 @@ void set_pose_keys(struct Object *ob); /** * Deactivates posemode - * @param freedata 0 or 1 value indicating that posedata should be deleted */ -void exit_posemode(int freedata); +void exit_posemode(void); void pose_special_editmenu(void); diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index bd512516d55..9f7ad98a1bc 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -208,9 +208,7 @@ #define B_SCENELOCK 140 #define B_LOCALVIEW 141 #define B_U_CAPSLOCK 142 -#define B_EDITMODE 143 -#define B_VPAINT 144 -#define B_FACESEL 145 + #define B_VIEWBUT 146 #define B_PERSP 147 #define B_PROPTOOL 148 @@ -218,9 +216,7 @@ #define B_VIEWTRANS 150 #define B_VIEWZOOM 151 #define B_STARTGAME 152 -#define B_POSEMODE 153 -#define B_TEXTUREPAINT 154 -#define B_WPAINT 155 + #define B_MODESELECT 156 #define B_AROUND 157 #define B_SEL_VERT 158 |