[Bf-blender-cvs] [879f5c8] master: Match corrective-smooth UI to smooth modifier

Campbell Barton noreply at git.blender.org
Wed Apr 1 01:55:45 CEST 2015


Commit: 879f5c832bfeaf1e29479319dbdf4898cbd43a6d
Author: Campbell Barton
Date:   Wed Apr 1 09:29:56 2015 +1100
Branches: master
https://developer.blender.org/rB879f5c832bfeaf1e29479319dbdf4898cbd43a6d

Match corrective-smooth UI to smooth modifier

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/makesrna/intern/rna_modifier.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index a3cf079..1186992 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1389,8 +1389,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
     def CORRECTIVE_SMOOTH(self, layout, ob, md):
         is_bind = md.is_bind
 
+        layout.prop(md, "factor", text="Factor")
         layout.prop(md, "iterations")
-        layout.prop(md, "lambda_factor", text="Factor")
 
         row = layout.row()
         row.prop(md, "smooth_type")
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 6353360..93f29db 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2169,7 +2169,7 @@ static void rna_def_modifier_correctivesmooth(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "CorrectiveSmoothModifierData");
 	RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH);
 
-	prop = RNA_def_property(srna, "lambda_factor", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "lambda");
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0, 1.0, 5, 3);




More information about the Bf-blender-cvs mailing list