From 967e294d9c113e88cd2932ab82f53f218d0ef752 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Wed, 13 Jul 2005 21:28:43 +0000
Subject: [PATCH] Three fixes;

- 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
---
 source/blender/blenkernel/intern/lattice.c |  6 ++--
 source/blender/src/buttons_editing.c       |  2 +-
 source/blender/src/editarmature.c          | 38 ++--------------------
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 6e3dde28a53..01b9d0795c5 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -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);
 
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 8a8423fe4bc..bd9661c864f 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -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)) {
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 56fd7406fd6..7aa49d91cab 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -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 */