[Bf-blender-cvs] [249e9cb] hair_system: Removed the deprecated steps-per-second property of the hair modifier.

[Lukas Tönne]

Commit: 249e9cb2272b34e6bf6d73c70e1dead5dcde08e5
Author: Lukas Tönne
Date:   Thu Jul 31 19:23:00 2014 +0200
Branches: hair_system
https://developer.blender.org/rB249e9cb2272b34e6bf6d73c70e1dead5dcde08e5

Removed the deprecated steps-per-second property of the hair modifier.

For now it uses Bullet time steps, this could later be modified.

===================================================================

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_hair.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 2f1fca4..6c5fc6a 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1231,7 +1231,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         
         col.separator()
         
-        col.prop(md, "steps_per_second")
         row = col.row()
         col2 = row.column()
         col2.prop(params, "stretch_stiffness")
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index e907f89..e37826d 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1372,9 +1372,9 @@ typedef struct HairModifierData {
 	struct HairSystem *hairsys;
 	
 	struct HAIR_Solver *solver;     /* runtime instance */
-	int steps_per_second;
 	
 	int flag;
+	int pad;
 } HairModifierData;
 
 enum {
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 9e57c5a..0bc4ed8 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -3676,13 +3676,6 @@ static void rna_def_modifier_hair(BlenderRNA *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "hairsys");
 	RNA_def_property_struct_type(prop, "HairSystem");
 	RNA_def_property_ui_text(prop, "Hair System", "");
-
-	prop = RNA_def_property(srna, "steps_per_second", PROP_INT, PROP_UNSIGNED);
-	RNA_def_property_int_sdna(prop, NULL, "steps_per_second");
-	RNA_def_property_int_default(prop, 30);
-	RNA_def_property_range(prop, 1, 512);
-	RNA_def_property_ui_text(prop, "Steps", "Steps per second");
-	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 void RNA_def_modifier(BlenderRNA *brna)
diff --git a/source/blender/modifiers/intern/MOD_hair.c b/source/blender/modifiers/intern/MOD_hair.c
index 51d562e..44eeed2 100644
--- a/source/blender/modifiers/intern/MOD_hair.c
+++ b/source/blender/modifiers/intern/MOD_hair.c
@@ -52,9 +52,8 @@ static void initData(ModifierData *md)
 	HairModifierData *hmd = (HairModifierData *) md;
 	
 	hmd->hairsys = BKE_hairsys_new();
-	
-	hmd->steps_per_second = 30;
 }
+
 static void freeData(ModifierData *md)
 {
 	HairModifierData *hmd = (HairModifierData *) md;