diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-26 04:42:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-26 04:42:21 +0400 |
commit | 94b8b8913e0283850cd2f05361a8980ecbe4870c (patch) | |
tree | 981cad884ee4958e60ed2436db1d5a32473e1dd9 | |
parent | df4a8a4dab9536cb153fedd0c12fa3e8dc16f7b1 (diff) |
rename lattice influence to strength from r45144 (other deform modifiers call it strength too)
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_vector.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 3 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_lattice.c | 4 |
9 files changed, 12 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index cbf354b2078..50b4a575383 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -320,7 +320,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): 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() diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index a02f2cc1c5d..f182d7bcb7c 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -785,7 +785,7 @@ void curve_deform_vector(Scene *scene, Object *cuOb, Object *target, } 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 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm, 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); diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c index e7c96ce3dc3..65600a31042 100644 --- a/source/blender/blenlib/intern/math_vector.c +++ b/source/blender/blenlib/intern/math_vector.c @@ -293,7 +293,7 @@ void project_v3_plane(float v[3], const float n[3], const float p[3]) 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); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 30ae9b6af52..502ffbd15b8 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -13339,7 +13339,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) 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; } } } diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 3cd764d2eb3..20111fc66b2 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1611,8 +1611,7 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op) /* 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"); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index d26d6f2cbfe..6046a468aed 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2970,7 +2970,6 @@ static int edbm_knife_cut_exec(bContext *C, wmOperator *op) /* get the cut curve */ RNA_BEGIN(op->ptr, itemptr, "path") { - RNA_float_get_array(&itemptr, "loc", (float *)&curve[len]); len++; if (len >= MAX_CUTS) { diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index bb2d320aa04..6c1d9892ba2 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -135,7 +135,7 @@ typedef struct LatticeModifierData { struct Object *object; char name[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */ - float influence; + float strength; char pad[4]; } LatticeModifierData; diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index dae9c0ca044..1782d075c16 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -961,10 +961,10 @@ static void rna_def_modifier_lattice(BlenderRNA *brna) 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"); } diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 5732fee7826..ca700d4d8f2 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -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 @@ static void deformVerts(ModifierData *md, Object *ob, 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( |