kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix for Join Armatures:

Browse Source 
When Join Armatures was called from the menu (Object -> Join Objects) problems were being cause by the use of BASEACT, causing some armatures to disappear and not be joined.
This commit is contained in:
Joshua Leung 2008-01-31 10:43:21 +00:00
parent abec067761
commit 538d93eb86
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/src/editarmature.c
View File

@ -253,7 +253,7 @@ void editbones_to_armature (ListBase *list, Object *ob)
for (eBone=list->first; eBone; eBone= neBone) { for (eBone=list->first; eBone; eBone= neBone) {
float len= VecLenf(eBone->head, eBone->tail); float len= VecLenf(eBone->head, eBone->tail);
neBone= eBone->next; neBone= eBone->next;
if(len <= FLT_EPSILON) { if (len <= FLT_EPSILON) {
EditBone *fBone; EditBone *fBone;
/* Find any bones that refer to this bone */ /* Find any bones that refer to this bone */
@ -267,7 +267,7 @@ void editbones_to_armature (ListBase *list, Object *ob)
} }
/* Copy the bones from the editData into the armature */ /* Copy the bones from the editData into the armature */
for (eBone=list->first; eBone; eBone=eBone->next){ for (eBone=list->first; eBone; eBone=eBone->next) {
newBone= MEM_callocN (sizeof(Bone), "bone"); newBone= MEM_callocN (sizeof(Bone), "bone");
eBone->temp= newBone; /* Associate the real Bones with the EditBones */ eBone->temp= newBone; /* Associate the real Bones with the EditBones */
@ -275,7 +275,8 @@ void editbones_to_armature (ListBase *list, Object *ob)
memcpy (newBone->head, eBone->head, sizeof(float)*3); memcpy (newBone->head, eBone->head, sizeof(float)*3);
memcpy (newBone->tail, eBone->tail, sizeof(float)*3); memcpy (newBone->tail, eBone->tail, sizeof(float)*3);
newBone->flag= eBone->flag; newBone->flag= eBone->flag;
if(eBone->flag & BONE_ACTIVE) newBone->flag |= BONE_SELECTED; /* important, editbones can be active with only 1 point selected */ if (eBone->flag & BONE_ACTIVE)
newBone->flag |= BONE_SELECTED; /* important, editbones can be active with only 1 point selected */
newBone->roll = 0.0f; newBone->roll = 0.0f;
newBone->weight = eBone->weight; newBone->weight = eBone->weight;
@ -289,16 +290,15 @@ void editbones_to_armature (ListBase *list, Object *ob)
newBone->rad_tail= eBone->rad_tail; newBone->rad_tail= eBone->rad_tail;
newBone->segments= eBone->segments; newBone->segments= eBone->segments;
newBone->layer = eBone->layer; newBone->layer = eBone->layer;
} }
/* Fix parenting in a separate pass to ensure ebone->bone connections /* Fix parenting in a separate pass to ensure ebone->bone connections
are valid at this point */ are valid at this point */
for (eBone=list->first;eBone;eBone=eBone->next) { for (eBone=list->first;eBone;eBone=eBone->next) {
newBone= (Bone*) eBone->temp; newBone= (Bone *)eBone->temp;
if (eBone->parent){ if (eBone->parent) {
newBone->parent=(Bone*) eBone->parent->temp; newBone->parent=(Bone *)eBone->parent->temp;
BLI_addtail (&newBone->parent->childbase,newBone); BLI_addtail(&newBone->parent->childbase,newBone);
{ {
float M_boneRest[3][3]; float M_boneRest[3][3];
@ -320,14 +320,14 @@ void editbones_to_armature (ListBase *list, Object *ob)
/* Get the new head and tail */ /* Get the new head and tail */
VecSubf (newBone->head, eBone->head, eBone->parent->tail); VecSubf (newBone->head, eBone->head, eBone->parent->tail);
VecSubf (newBone->tail, eBone->tail, eBone->parent->tail); VecSubf (newBone->tail, eBone->tail, eBone->parent->tail);
Mat3MulVecfl(iM_parentRest, newBone->head); Mat3MulVecfl(iM_parentRest, newBone->head);
Mat3MulVecfl(iM_parentRest, newBone->tail); Mat3MulVecfl(iM_parentRest, newBone->tail);
} }
} }
/* ...otherwise add this bone to the armature's bonebase */ /* ...otherwise add this bone to the armature's bonebase */
else else
BLI_addtail (&arm->bonebase,newBone); BLI_addtail(&arm->bonebase,newBone);
} }
/* Make a pass through the new armature to fix rolling */ /* Make a pass through the new armature to fix rolling */

10
source/blender/src/header_view3d.c
View File

@ -2396,15 +2396,17 @@ extern ListBase session_list;
static void do_view3d_edit_objectmenu(void *arg, int event) static void do_view3d_edit_objectmenu(void *arg, int event)
{ {
#ifdef WITH_VERSE
struct VerseSession *session=NULL;
/* needed to check for valid selected objects */ /* needed to check for valid selected objects */
Base *base=NULL; Base *base=NULL;
Object *ob=NULL; Object *ob=NULL;
#ifdef WITH_VERSE
struct VerseSession *session=NULL;
#endif
base= BASACT; base= BASACT;
if (base) ob= base->object; if (base) ob= base->object;
#endif
switch(event) { switch(event) {