archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Killed silly modal PoseMode mode! :)

Browse Source 
- 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.
This commit is contained in:
Ton Roosendaal
2005-07-23 18:52:31 +00:00
parent 6e98a38ea2
commit 948f27c0d8
38 changed files with 1403 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/src/transform_generics.c
View File

@@ -112,14 +112,16 @@ void getViewVector(float coord[3], float vec[3]) {
/* called for objects updating while transform acts, once per redraw */
void recalcData(TransInfo *t)
{
Base *base;
Object *ob= OBACT;
if(G.obpose) {
if(ob && (ob->flag & OB_POSEMODE)) {
bArmature *arm= ob->data;
/* old optimize trick... this enforces to bypass the depgraph */
if (!is_delay_deform())
DAG_object_flush_update(G.scene, G.obpose, OB_RECALC_DATA); /* sets recalc flags */
if (!(arm->flag & ARM_DELAYDEFORM))
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); /* sets recalc flags */
else
where_is_pose(G.obpose);
where_is_pose(ob);
}
else if (G.obedit) {
@@ -166,6 +168,7 @@ void recalcData(TransInfo *t)
}
}
else {
Base *base;
base= FIRSTBASE;
while(base) {
@@ -266,9 +269,10 @@ void drawLine(float *center, float *dir, char axis, short options)
void initTrans (TransInfo *t)
{
Object *ob= OBACT;
/* moving: is shown in drawobject() (transform color) */
if(G.obedit || G.obpose) G.moving= G_TRANSFORM_EDIT;
if(G.obedit || (ob && (ob->flag & OB_POSEMODE)) ) G.moving= G_TRANSFORM_EDIT;
else G.moving= G_TRANSFORM_OBJ;
t->data = NULL;
@@ -468,7 +472,7 @@ void calculateCenterCursor(TransInfo *t)
VECCOPY(t->center, cursor);
if(t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:G.obpose;
Object *ob= G.obedit?G.obedit:OBACT;
float mat[3][3], imat[3][3];
float vec[3];
@@ -506,7 +510,7 @@ void calculateCenterMedian(TransInfo *t)
VECCOPY(t->center, partial);
if (t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:G.obpose;
Object *ob= G.obedit?G.obedit:OBACT;
float vec[3];
VECCOPY(vec, t->center);
@@ -545,7 +549,7 @@ void calculateCenterBound(TransInfo *t)
VecMulf(t->center, 0.5);
if (t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:G.obpose;
Object *ob= G.obedit?G.obedit:OBACT;
float vec[3];
VECCOPY(vec, t->center);
@@ -589,7 +593,7 @@ void calculateCenter(TransInfo *t)
/* setting constraint center */
VECCOPY(t->con.center, t->center);
if(t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:G.obpose;
Object *ob= G.obedit?G.obedit:OBACT;
Mat4MulVecfl(ob->obmat, t->con.center);
}