[Bf-blender-cvs] [c253ef8] alembic: Use matching defaults and ranges in RNA/BKE for hairsim parameters.

Lukas Tönne noreply at git.blender.org
Tue Apr 7 14:51:58 CEST 2015


Commit: c253ef851c357a48eb4eda772ac15503c71eff68
Author: Lukas Tönne
Date:   Tue Apr 7 14:51:31 2015 +0200
Branches: alembic
https://developer.blender.org/rBc253ef851c357a48eb4eda772ac15503c71eff68

Use matching defaults and ranges in RNA/BKE for hairsim parameters.

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

M	source/blender/blenkernel/intern/cache_library.c
M	source/blender/makesrna/intern/rna_cache_library.c

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

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index 67ba857..d658a55 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -566,7 +566,7 @@ static void hairsim_params_init(HairSimParams *params)
 	params->mass = 0.3f;
 	params->drag = 0.1f;
 	
-	params->stretch_stiffness = 1000.0f;
+	params->stretch_stiffness = 10000.0f;
 	params->stretch_damping = 0.1f;
 	params->bend_stiffness = 100.0f;
 	params->bend_damping = 1.0f;
diff --git a/source/blender/makesrna/intern/rna_cache_library.c b/source/blender/makesrna/intern/rna_cache_library.c
index 7da5f37..f9a7bb2 100644
--- a/source/blender/makesrna/intern/rna_cache_library.c
+++ b/source/blender/makesrna/intern/rna_cache_library.c
@@ -206,6 +206,7 @@ static void rna_def_hair_sim_params(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "goal_stiffness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1f, 3);
+	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_ui_text(prop, "Goal Strength", "Goal spring, pulling vertices toward their rest position");
 	RNA_def_property_update(prop, 0, "rna_CacheModifier_update");
 	
@@ -219,6 +220,7 @@ static void rna_def_hair_sim_params(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "stretch_stiffness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0f, 10000.0f, 0.1f, 3);
+	RNA_def_property_float_default(prop, 10000.0f);
 	RNA_def_property_ui_text(prop, "Stretch Stiffness", "Resistence to stretching");
 	RNA_def_property_update(prop, 0, "rna_CacheModifier_update");
 	
@@ -232,6 +234,7 @@ static void rna_def_hair_sim_params(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "bend_stiffness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0f, 1000.0f, 0.1f, 3);
+	RNA_def_property_float_default(prop, 100.0f);
 	RNA_def_property_ui_text(prop, "Bend Stiffness", "Resistance to bending of the rest shape");
 	RNA_def_property_update(prop, 0, "rna_CacheModifier_update");




More information about the Bf-blender-cvs mailing list