[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22915] branches/blender2.5/blender: remove "_amount" from rna names, its not helpful.

[Campbell Barton]

Revision: 22915
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22915
Author:   campbellbarton
Date:     2009-08-31 18:36:02 +0200 (Mon, 31 Aug 2009)

Log Message:
-----------
remove "_amount" from rna names, its not helpful.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
    branches/blender2.5/blender/release/ui/buttons_texture.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c

Modified: branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physics_fluid.py	2009-08-31 15:57:13 UTC (rev 22914)
+++ branches/blender2.5/blender/release/ui/buttons_physics_fluid.py	2009-08-31 16:36:02 UTC (rev 22915)
@@ -94,7 +94,7 @@
 				col.itemL(text="Slip Type:")
 				col.itemR(fluid, "slip_type", text="")
 				if fluid.slip_type == 'PARTIALSLIP':
-					col.itemR(fluid, "partial_slip_amount", slider=True, text="Amount")
+					col.itemR(fluid, "partial_slip_factor", slider=True, text="Amount")
 					
 				col.itemL(text="Impact:")
 				col.itemR(fluid, "impact_factor", text="Factor")
@@ -228,7 +228,7 @@
 		sub = col.column(align=True)
 		sub.itemR(fluid, "slip_type", text="")
 		if fluid.slip_type == 'PARTIALSLIP':
-			sub.itemR(fluid, "partial_slip_amount", slider=True, text="Amount")
+			sub.itemR(fluid, "partial_slip_factor", slider=True, text="Amount")
 
 		col = split.column()
 		col.itemL(text="Surface:")

Modified: branches/blender2.5/blender/release/ui/buttons_texture.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_texture.py	2009-08-31 15:57:13 UTC (rev 22914)
+++ branches/blender2.5/blender/release/ui/buttons_texture.py	2009-08-31 16:36:02 UTC (rev 22915)
@@ -609,7 +609,7 @@
 		layout.itemR(tex, "noise_basis", text="Basis")
 		
 		flow = layout.column_flow()
-		flow.itemR(tex, "distortion_amount", text="Distortion")
+		flow.itemR(tex, "distortion", text="Distortion")
 		flow.itemR(tex, "noise_size", text="Size")
 		flow.itemR(tex, "nabla")	
 		

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c	2009-08-31 15:57:13 UTC (rev 22914)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c	2009-08-31 16:36:02 UTC (rev 22915)
@@ -162,7 +162,7 @@
 	RNA_def_property_enum_items(prop, slip_items);
 	RNA_def_property_ui_text(prop, "Slip Type", "");
 
-	prop= RNA_def_property(srna, "partial_slip_amount", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "partial_slip_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "partSlipValue");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Partial Slip Amount", "Amount of mixing between no- and free-slip, 0 is no slip and 1 is free slip.");

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c	2009-08-31 15:57:13 UTC (rev 22914)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c	2009-08-31 16:36:02 UTC (rev 22915)
@@ -1293,7 +1293,7 @@
 	RNA_def_struct_ui_text(srna, "Distorted Noise", "Procedural distorted noise texture.");
 	RNA_def_struct_sdna(srna, "Tex");
 
-	prop= RNA_def_property(srna, "distortion_amount", PROP_FLOAT, PROP_NONE);
+	prop= RNA_def_property(srna, "distortion", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "dist_amount");
 	RNA_def_property_range(prop, 0, 10);
 	RNA_def_property_ui_text(prop, "Distortion Amount", "");