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

Three fixes;

Browse Source 
- Armature editmode, while armature was deforming children, was very slow
  because it kept making subsurfs... this goes still hackish :)
- CTRL+A on armatures used loadsa old code, removed all of it! Still works.
- Using "Set smooth" or "Set solid" on file loaded without 3d window
  crashed
This commit is contained in:
Ton Roosendaal 2005-07-13 21:28:43 +00:00
parent 682c51663e
commit 967e294d9c
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/lattice.c
View File

@ -642,9 +642,11 @@ static int _object_deform(Object *ob, int applyflag)
return 1;
}
else if(ob->parent->type==OB_ARMATURE) {
if (ob->partype != PARSKEL || ob->parent==G.obedit){
if (ob->partype != PARSKEL)
return 0;
}
if (ob->parent==G.obedit) // misleading making displists... very bad
return 1;
init_armature_deform (ob->parent, ob);

2
source/blender/src/buttons_editing.c
View File

@ -601,7 +601,7 @@ void do_common_editbuts(unsigned short event) // old name, is a mix of object an
makeDispList(G.obedit);
allqueue(REDRAWVIEW3D, 0);
}
else {
else if(G.vd) {
base= FIRSTBASE;
while(base) {
if(TESTBASELIB(base)) {

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

@ -317,42 +317,8 @@ void apply_rot_armature (Object *ob, float mat[3][3])
/* Do the rotations */
for (ebone = list.first; ebone; ebone=ebone->next){
{
/* Fixme: This is essentially duplicated from join_armature */
/* Yah, later... :) (ton) */
float premat[4][4];
float postmat[4][4];
float difmat[4][4];
float imat[4][4];
float temp[3][3];
float delta[3];
float rmat[4][4];
Mat4CpyMat3 (rmat, mat);
/* Get the premat */
VecSubf (delta, ebone->tail, ebone->head);
vec_roll_to_mat3(delta, ebone->roll, temp);
Mat4MulMat34 (premat, temp, rmat);
Mat4MulVecfl(rmat, ebone->head);
Mat4MulVecfl(rmat, ebone->tail);
/* Get the postmat */
VecSubf (delta, ebone->tail, ebone->head);
vec_roll_to_mat3(delta, ebone->roll, temp);
Mat4CpyMat3(postmat, temp);
/* Find the roll */
Mat4Invert (imat, premat);
Mat4MulMat4 (difmat, postmat, imat);
ebone->roll -=atan(difmat[2][0]/difmat[2][2]);
if (difmat[0][0]<0) ebone->roll +=M_PI;
}
Mat3MulVecfl(mat, ebone->head);
Mat3MulVecfl(mat, ebone->tail);
}
/* Turn the list into an armature */