[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48293] branches/soc-2012-sushi: Change in the distribution of the layout and change in the limits of the parameters

Alexander Pinzon apinzonf at gmail.com
Tue Jun 26 01:35:43 CEST 2012


Revision: 48293
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48293
Author:   apinzonf
Date:     2012-06-25 23:35:29 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Change in the distribution of the layout and change in the limits of the parameters

Modified Paths:
--------------
    branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2012-sushi/source/blender/makesrna/intern/rna_modifier.c

Modified: branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_modifier.py	2012-06-25 21:44:42 UTC (rev 48292)
+++ branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_modifier.py	2012-06-25 23:35:29 UTC (rev 48293)
@@ -308,21 +308,22 @@
             row.operator("object.hook_select", text="Select")
             row.operator("object.hook_assign", text="Assign")
     def LAPLACIANSMOOTH(self, layout, ob, md):
-        split = layout.split(percentage=0.25)
+        #split = layout.split(percentage=0.25)
 
-        col = split.column()
-        col.label(text="Axis:")
-        col.prop(md, "use_x")
-        col.prop(md, "use_y")
-        col.prop(md, "use_z")
+        #col = split.column()
 
-        col = split.column()
-        col.prop(md, "iterations")
-        col.prop(md, "lamb")
-        col.prop(md, "lambdaborder")
-        col.prop(md, "minarea")
-        col.label(text="Vertex Group:")
-        col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
+        #col = split.column()
+        layout.prop(md, "iterations")
+        layout.prop(md, "lamb")
+        layout.prop(md, "lambdaborder")
+        layout.prop(md, "minarea")
+        layout.label(text="Axis:")
+        row = layout.row()
+        row.prop(md, "use_x")
+        row.prop(md, "use_y")
+        row.prop(md, "use_z")
+        layout.label(text="Vertex Group:")
+        layout.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
 
     def LATTICE(self, layout, ob, md):
         split = layout.split()

Modified: branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c	2012-06-25 21:44:42 UTC (rev 48292)
+++ branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c	2012-06-25 23:35:29 UTC (rev 48293)
@@ -1667,14 +1667,14 @@
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	RNA_def_int(ot->srna, "repeat", 1, 1, 50, 
-					"Number of iterations to smooth the mesh", "", 1, 50);
-	RNA_def_float(ot->srna, "lambda", 0.00005f, 0.0000001f, 100.0f, 
-					"Lambda factor", "", 0.0000001f, 100.0f);
-	RNA_def_float(ot->srna, "lambda_border", 0.00005f, 0.0000001f, 100.0f, 
-					"Lambda factor in border", "", 0.0000001f, 100.0f);
-	RNA_def_float(ot->srna, "min_area", 0.00001f, 0.0000000000000001f, 100.0f, 
-					"Minimum area permitted", "", 0.0000000000000001f, 100.0f);
+	RNA_def_int(ot->srna, "repeat", 1, 1, 200, 
+					"Number of iterations to smooth the mesh", "", 1, 200);
+	RNA_def_float(ot->srna, "lambda", 0.00005f, 0.0000001f, 1000.0f, 
+					"Lambda factor", "", 0.0000001f, 1000.0f);
+	RNA_def_float(ot->srna, "lambda_border", 0.00005f, 0.0000001f, 1000.0f, 
+					"Lambda factor in border", "", 0.0000001f, 1000.0f);
+	RNA_def_float(ot->srna, "min_area", 0.00001f, 0.0000000000000001f, 1000.0f, 
+					"Minimum area permitted", "", 0.0000000000000001f, 1000.0f);
 	RNA_def_boolean(ot->srna, "use_x", 1, "Smooth X Axis", "Smooth object along	X axis");
 	RNA_def_boolean(ot->srna, "use_y", 1, "Smooth Y Axis", "Smooth object along	Y axis");
 	RNA_def_boolean(ot->srna, "use_z", 1, "Smooth Z Axis", "Smooth object along	Z axis");

Modified: branches/soc-2012-sushi/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/soc-2012-sushi/source/blender/makesrna/intern/rna_modifier.c	2012-06-25 21:44:42 UTC (rev 48292)
+++ branches/soc-2012-sushi/source/blender/makesrna/intern/rna_modifier.c	2012-06-25 23:35:29 UTC (rev 48293)
@@ -1764,27 +1764,27 @@
 	prop = RNA_def_property(srna, "lamb", 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.0000001, 100.0, 0.0000001, 8);
+	RNA_def_property_ui_range(prop, 0.0000001, 1000.0, 0.0000001, 8);
 	RNA_def_property_ui_text(prop, "Lambda Factor", "Smooth factor effect");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "lambdaborder", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "lambda_border");
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
-	RNA_def_property_ui_range(prop, 0.0000001, 100.0, 0.0000001, 8);
+	RNA_def_property_ui_range(prop, 0.0000001, 1000.0, 0.0000001, 8);
 	RNA_def_property_ui_text(prop, "Lambda border", "Lambda factor in border");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "minarea", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min_area");
 	RNA_def_property_range(prop, 0.0000000000000001, FLT_MAX);
-	RNA_def_property_ui_range(prop, 0.0000000000000001, 100.0, 0.0000001, 18);
+	RNA_def_property_ui_range(prop, 0.0000000000000001, 1000.0, 0.0000001, 18);
 	RNA_def_property_ui_text(prop, "Minimum area", "Minimum area permitted");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "repeat");
-	RNA_def_property_ui_range(prop, 0, 50, 1, 0);
+	RNA_def_property_ui_range(prop, 0, 200, 1, 0);
 	RNA_def_property_ui_text(prop, "Repeat", "");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	




More information about the Bf-blender-cvs mailing list