[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46335] trunk/blender: Removing the old armature 'deform' settings (use vertex groups/envelopes/ quats).

Joshua Leung aligorith at gmail.com
Sun May 6 06:50:05 CEST 2012


Revision: 46335
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46335
Author:   aligorith
Date:     2012-05-06 04:50:04 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Removing the old armature 'deform' settings (use vertex groups/envelopes/quats).

As far as I could tell, these were really only still used for "virtual
modifiers", though we really don't use these anymore. Instead, most of the time,
people need to set these settings in armature modifiers directly (these didn't
even get copied over in that case). This was a source of confusion and
redundancy, so removing these now.

This change can be reverted if these were actually of some use out there...

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/collada/SkinInfo.cpp
    trunk/blender/source/blender/makesrna/intern/rna_armature.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py	2012-05-06 04:18:13 UTC (rev 46334)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py	2012-05-06 04:50:04 UTC (rev 46335)
@@ -65,14 +65,10 @@
         col.label(text="Protected Layers:")
         col.prop(arm, "layers_protected", text="")
 
-        layout.label(text="Deform:")
-        flow = layout.column_flow()
-        flow.prop(arm, "use_deform_vertex_groups", text="Vertex Groups")
-        flow.prop(arm, "use_deform_envelopes", text="Envelopes")
-        flow.prop(arm, "use_deform_preserve_volume", text="Quaternion")
-
         if context.scene.render.engine == 'BLENDER_GAME':
-            layout.row().prop(arm, "deform_method", expand=True)
+            col = layout.column()
+            col.label(text="Deform:")
+            col.prop(arm, "deform_method", expand=True)
 
 
 class DATA_PT_display(ArmatureButtonsPanel, Panel):

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-05-06 04:18:13 UTC (rev 46334)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-05-06 04:50:04 UTC (rev 46335)
@@ -416,6 +416,7 @@
 	return tmp_md;
 }
 
+/* NOTE: these aren't used anymore */
 ModifierData *modifiers_getVirtualModifierList(Object *ob)
 {
 	/* Kinda hacky, but should be fine since we are never

Modified: trunk/blender/source/blender/collada/SkinInfo.cpp
===================================================================
--- trunk/blender/source/blender/collada/SkinInfo.cpp	2012-05-06 04:18:13 UTC (rev 46334)
+++ trunk/blender/source/blender/collada/SkinInfo.cpp	2012-05-06 04:50:04 UTC (rev 46335)
@@ -218,7 +218,8 @@
 	Scene *scene = CTX_data_scene(C);
 
 	ModifierData *md = ED_object_modifier_add(NULL, bmain, scene, ob, NULL, eModifierType_Armature);
-	((ArmatureModifierData *)md)->object = ob_arm;
+	ArmatureModifierData *amd = (ArmatureModifierData *)md;
+	amd->object = ob_arm;
 
 	copy_m4_m4(ob->obmat, bind_shape_matrix);
 	BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
@@ -239,7 +240,7 @@
 	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
 #endif
 
-	((bArmature*)ob_arm->data)->deformflag = ARM_DEF_VGROUP;
+	amd->deformflag = ARM_DEF_VGROUP;
 
 	// create all vertex groups
 	std::vector<JointData>::iterator it;

Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c	2012-05-06 04:18:13 UTC (rev 46334)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c	2012-05-06 04:50:04 UTC (rev 46335)
@@ -894,7 +894,7 @@
 	prop = RNA_def_property(srna, "deform_method", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "gevertdeformer");
 	RNA_def_property_enum_items(prop, prop_vdeformer);
-	RNA_def_property_ui_text(prop, "Vertex Deformer", "");
+	RNA_def_property_ui_text(prop, "Vertex Deformer", "Vertex Deformer Method (Game Engine only)");
 	RNA_def_property_update(prop, 0, "rna_Armature_redraw_data");
 	RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
 	
@@ -973,30 +973,6 @@
 	RNA_def_property_update(prop, 0, "rna_Armature_redraw_data");
 	RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
 /* XXX depreceated ....... old animviz for armatures only */
-	
-		/* deformflag */
-	prop = RNA_def_property(srna, "use_deform_vertex_groups", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_VGROUP);
-	RNA_def_property_ui_text(prop, "Deform Vertex Groups", "Enable Vertex Groups when defining deform");
-	RNA_def_property_update(prop, 0, "rna_Armature_update_data");
-	
-	prop = RNA_def_property(srna, "use_deform_envelopes", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_ENVELOPE);
-	RNA_def_property_ui_text(prop, "Deform Envelopes", "Enable Bone Envelopes when defining deform");
-	RNA_def_property_update(prop, 0, "rna_Armature_update_data");
-	
-	prop = RNA_def_property(srna, "use_deform_preserve_volume", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_QUATERNION);
-	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");
-	
-#if 0
-	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)");
-	RNA_def_property_update(prop, 0, "rna_Armature_update_data");
-#endif
 
 	/* Number fields */
 /* XXX depreceated ....... old animviz for armatures only */




More information about the Bf-blender-cvs mailing list