[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45150] trunk/blender: rename lattice influence to strength from r45144 ( other deform modifiers call it strength too)

[Campbell Barton]

Revision: 45150
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45150
Author:   campbellbarton
Date:     2012-03-26 00:42:21 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
rename lattice influence to strength from r45144 (other deform modifiers call it strength too)

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45144

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    trunk/blender/source/blender/blenkernel/intern/lattice.c
    trunk/blender/source/blender/blenlib/intern/math_vector.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/makesdna/DNA_modifier_types.h
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c
    trunk/blender/source/blender/modifiers/intern/MOD_lattice.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2012-03-26 00:42:21 UTC (rev 45150)
@@ -320,7 +320,7 @@
         col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
         
         layout.separator()
-        layout.prop(md, "influence", slider=True)
+        layout.prop(md, "strength", slider=True)
 
     def MASK(self, layout, ob, md):
         split = layout.split()

Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c	2012-03-26 00:42:21 UTC (rev 45150)
@@ -785,7 +785,7 @@
 }
 
 void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
-                          float (*vertexCos)[3], int numVerts, const char *vgroup, float influence)
+                          float (*vertexCos)[3], int numVerts, const char *vgroup, float fac)
 {
 	int a;
 	int use_vgroups;
@@ -824,13 +824,13 @@
 				weight= defvert_find_weight(dvert, index);
 
 				if (weight > 0.0f)
-					calc_latt_deform(laOb, vertexCos[a], weight*influence);
+					calc_latt_deform(laOb, vertexCos[a], weight * fac);
 			}
 		}
 	}
 	else {
 		for (a = 0; a < numVerts; a++) {
-			calc_latt_deform(laOb, vertexCos[a], influence);
+			calc_latt_deform(laOb, vertexCos[a], fac);
 		}
 	}
 	end_latt_deform(laOb);

Modified: trunk/blender/source/blender/blenlib/intern/math_vector.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector.c	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/blenlib/intern/math_vector.c	2012-03-26 00:42:21 UTC (rev 45150)
@@ -293,7 +293,7 @@
 	float mul;
 
 	sub_v3_v3v3(vector, v, p);
-	mul = dot_v3v3(vector, n)/len_squared_v3(n);
+	mul = dot_v3v3(vector, n) / len_squared_v3(n);
 
 	mul_v3_v3fl(vector, n, mul);
 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-03-26 00:42:21 UTC (rev 45150)
@@ -13339,7 +13339,7 @@
 			for(md=ob->modifiers.first; md; md=md->next) {
 				if(md->type == eModifierType_Lattice) {
 					LatticeModifierData *lmd = (LatticeModifierData *)md;
-					lmd->influence = 1.0f;
+					lmd->strength = 1.0f;
 				}
 			}
 		}

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2012-03-26 00:42:21 UTC (rev 45150)
@@ -1611,8 +1611,7 @@
 	/* loop over the stroke RNA elements recorded (i.e. progress of mouse movement),
 	 * setting the relevant values in context at each step, then applying
 	 */
-	RNA_BEGIN(op->ptr, itemptr, "stroke") 
-	{
+	RNA_BEGIN(op->ptr, itemptr, "stroke") {
 		float mousef[2];
 		
 		//printf("\t\tGP - stroke elem \n");

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-03-26 00:42:21 UTC (rev 45150)
@@ -2970,7 +2970,6 @@
 
 	/* get the cut curve */
 	RNA_BEGIN(op->ptr, itemptr, "path") {
-		
 		RNA_float_get_array(&itemptr, "loc", (float *)&curve[len]);
 		len++;
 		if (len >= MAX_CUTS) {

Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h	2012-03-26 00:42:21 UTC (rev 45150)
@@ -135,7 +135,7 @@
 
 	struct Object *object;
 	char name[64];			/* optional vertexgroup name, MAX_VGROUP_NAME */
-	float influence;
+	float strength;
 	char pad[4];
 } LatticeModifierData;
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2012-03-26 00:42:21 UTC (rev 45150)
@@ -961,10 +961,10 @@
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_LatticeModifier_vgroup_set");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
-	prop = RNA_def_property(srna, "influence", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 1, 10, 2);
-	RNA_def_property_ui_text(prop, "Influence", "Strength of modifier effect");
+	RNA_def_property_ui_text(prop, "Strength", "Strength of modifier effect");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 

Modified: trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_lattice.c	2012-03-26 00:12:53 UTC (rev 45149)
+++ trunk/blender/source/blender/modifiers/intern/MOD_lattice.c	2012-03-26 00:42:21 UTC (rev 45150)
@@ -51,7 +51,7 @@
 static void initData(ModifierData *md)
 {
 	LatticeModifierData *lmd = (LatticeModifierData*) md;
-	lmd->influence = 1.0f;
+	lmd->strength = 1.0f;
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
@@ -119,7 +119,7 @@
 	modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
 	
 	lattice_deform_verts(lmd->object, ob, derivedData,
-	                     vertexCos, numVerts, lmd->name, lmd->influence);
+	                     vertexCos, numVerts, lmd->name, lmd->strength);
 }
 
 static void deformVertsEM(