[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30221] trunk/blender: 2.5: remove armature "B-Bone Rest" option, this was only added to keep

[Brecht Van Lommel]

Revision: 30221
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30221
Author:   blendix
Date:     2010-07-12 13:04:51 +0200 (Mon, 12 Jul 2010)

Log Message:
-----------
2.5: remove armature "B-Bone Rest" option, this was only added to keep
broken behavior for backwards compatibility, it's been there long enough
now to be removed.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_armature.py
    trunk/blender/source/blender/blenkernel/intern/armature.c
    trunk/blender/source/blender/makesdna/DNA_armature_types.h
    trunk/blender/source/blender/makesrna/intern/rna_armature.c

Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py	2010-07-12 11:02:01 UTC (rev 30220)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py	2010-07-12 11:04:51 UTC (rev 30221)
@@ -93,7 +93,6 @@
         if wide_ui:
             col = split.column()
         col.prop(arm, "deform_quaternion", text="Quaternion")
-        col.prop(arm, "deform_bbone_rest", text="B-Bones Rest")
 
 
 class DATA_PT_display(DataButtonsPanel):
@@ -122,7 +121,6 @@
             col = split.column()
         col.prop(arm, "draw_group_colors", text="Colors")
         col.prop(arm, "delay_deform", text="Delay Refresh")
-        col.prop(ob, "x_ray", text="X-Ray (Object)")
 
 
 class DATA_PT_bone_groups(DataButtonsPanel):

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2010-07-12 11:02:01 UTC (rev 30220)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2010-07-12 11:04:51 UTC (rev 30221)
@@ -687,11 +687,11 @@
 
 /* ************ Armature Deform ******************* */
 
-static void pchan_b_bone_defmats(bPoseChannel *pchan, int use_quaternion, int rest_def)
+static void pchan_b_bone_defmats(bPoseChannel *pchan, int use_quaternion)
 {
 	Bone *bone= pchan->bone;
 	Mat4 *b_bone= b_bone_spline_setup(pchan, 0);
-	Mat4 *b_bone_rest= (rest_def)? NULL: b_bone_spline_setup(pchan, 1);
+	Mat4 *b_bone_rest= b_bone_spline_setup(pchan, 1);
 	Mat4 *b_bone_mats;
 	DualQuat *b_bone_dual_quats= NULL;
 	float tmat[4][4];
@@ -718,10 +718,7 @@
 	unit_m4(tmat);
 
 	for(a=0; a<bone->segments; a++) {
-		if(b_bone_rest)
-			invert_m4_m4(tmat, b_bone_rest[a].mat);
-		else
-			tmat[3][1] = -a*(bone->length/(float)bone->segments);
+		invert_m4_m4(tmat, b_bone_rest[a].mat);
 
 		mul_serie_m4(b_bone_mats[a+1].mat, pchan->chan_mat, bone->arm_mat,
 			b_bone[a].mat, tmat, b_bone_mats[0].mat, NULL, NULL, NULL);
@@ -919,7 +916,6 @@
 	float obinv[4][4], premat[4][4], postmat[4][4];
 	int use_envelope = deformflag & ARM_DEF_ENVELOPE;
 	int use_quaternion = deformflag & ARM_DEF_QUATERNION;
-	int bbone_rest_def = deformflag & ARM_DEF_B_BONE_REST;
 	int invert_vgroup= deformflag & ARM_DEF_INVERT_VGROUP;
 	int numGroups = 0;		/* safety for vertexgroup index overflow */
 	int i, target_totvert = 0;	/* safety for vertexgroup overflow */
@@ -946,7 +942,7 @@
 	for(pchan = armOb->pose->chanbase.first; pchan; pchan = pchan->next) {
 		if(!(pchan->bone->flag & BONE_NO_DEFORM)) {
 			if(pchan->bone->segments > 1)
-				pchan_b_bone_defmats(pchan, use_quaternion, bbone_rest_def);
+				pchan_b_bone_defmats(pchan, use_quaternion);
 
 			if(use_quaternion) {
 				pchan->dual_quat= &dualquats[totchan++];
@@ -1701,6 +1697,8 @@
 	
 	ob->pose->flag &= ~POSE_RECALC;
 	ob->pose->flag |= POSE_WAS_REBUILT;
+
+	make_pose_channels_hash(ob->pose);
 }
 
 

Modified: trunk/blender/source/blender/makesdna/DNA_armature_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_armature_types.h	2010-07-12 11:02:01 UTC (rev 30220)
+++ trunk/blender/source/blender/makesdna/DNA_armature_types.h	2010-07-12 11:04:51 UTC (rev 30221)
@@ -134,7 +134,7 @@
 	ARM_DEF_VGROUP			= (1<<0),
 	ARM_DEF_ENVELOPE		= (1<<1),
 	ARM_DEF_QUATERNION		= (1<<2),
-	ARM_DEF_B_BONE_REST		= (1<<3),
+	ARM_DEF_B_BONE_REST		= (1<<3),	/* deprecated */
 	ARM_DEF_INVERT_VGROUP	= (1<<4)
 } eArmature_DeformFlag;
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c	2010-07-12 11:02:01 UTC (rev 30220)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c	2010-07-12 11:04:51 UTC (rev 30221)
@@ -861,11 +861,6 @@
 	RNA_def_property_ui_text(prop, "Use Dual Quaternion Deformation", "Enable deform rotation with Quaternions");
 	RNA_def_property_update(prop, 0, "rna_Armature_update_data");
 	
-	prop= RNA_def_property(srna, "deform_bbone_rest", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_B_BONE_REST);
-	RNA_def_property_ui_text(prop, "B-Bones Deform in Rest Position", "Make B-Bones deform already in Rest Position");
-	RNA_def_property_update(prop, 0, "rna_Armature_update_data");
-	
 	//prop= RNA_def_property(srna, "deform_invert_vertexgroups", PROP_BOOLEAN, PROP_NONE);
 	//RNA_def_property_boolean_negative_sdna(prop, NULL, "deformflag", ARM_DEF_INVERT_VGROUP);
 	//RNA_def_property_ui_text(prop, "Invert Vertex Group Influence", "Invert Vertex Group influence (only for Modifiers)");