Revision: 39917
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39917
Author: campbellbarton
Date: 2011-09-05 04:53:23 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b"
also clamp more values between 0.0 and 1.0
Modified Paths:
--------------
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c
Modified:
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
---
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-09-05 04:00:08 UTC (rev 39916)
+++
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-09-05 04:53:23 UTC (rev 39917)
@@ -822,19 +822,19 @@
if ob.type == 'MESH':
split = layout.split()
col = split.column()
- col.label(text="Vertex Group 1:")
- col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
- col.label(text="Default Weight 1:")
- col.prop(md, "default_weight", text="")
+ col.label(text="Vertex Group A:")
+ col.prop_search(md, "vertex_group_a", ob, "vertex_groups", text="")
+ col.label(text="Default Weight A:")
+ col.prop(md, "default_weight_a", text="")
col.label(text="Mix Mode:")
col.prop(md, "mix_mode", text="")
col = split.column()
- col.label(text="Vertex Group 2:")
- col.prop_search(md, "vertex_group2", ob, "vertex_groups", text="")
- col.label(text="Default Weight 2:")
- col.prop(md, "default_weight2", text="")
+ col.label(text="Vertex Group B:")
+ col.prop_search(md, "vertex_group_b", ob, "vertex_groups", text="")
+ col.label(text="Default Weight B:")
+ col.prop(md, "default_weight_b", text="")
col.label(text="Mix Set:")
col.prop(md, "mix_set", text="")
Modified: branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
2011-09-05 04:00:08 UTC (rev 39916)
+++ branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
2011-09-05 04:53:23 UTC (rev 39917)
@@ -841,10 +841,10 @@
/* XXX Note: I tried to keep everything logically ordered – provided the
* alignment constraints... */
- char defgrp_name[32]; /* Name of vertex group to modify/weight.
*/
- char defgrp_name2[32]; /* Name of other vertex group to mix in.
*/
- float default_weight; /* Default weight value for first vgroup.
*/
- float default_weight2; /* Default weight value to mix in. */
+ char defgrp_name_a[32]; /* Name of vertex group to
modify/weight. */
+ char defgrp_name_b[32]; /* Name of other vertex group to mix in.
*/
+ float default_weight_a; /* Default weight value for first
vgroup. */
+ float default_weight_b; /* Default weight value to mix in. */
char mix_mode; /* How second vgroups weights affect
first ones */
char mix_set; /* What vertices to affect. */
@@ -876,10 +876,10 @@
/* What vertices to affect. */
#define MOD_WVG_SET_ALL 1 /* Affect all vertices. */
-#define MOD_WVG_SET_ORG 2 /* Affect only vertices in
first vgroup. */
-#define MOD_WVG_SET_NEW 3 /* Affect only vertices in
second vgroup. */
-#define MOD_WVG_SET_UNION 4 /* Affect only vertices in one vgroup
or the other. */
-#define MOD_WVG_SET_INTER 5 /* Affect only vertices in both
vgroups. */
+#define MOD_WVG_SET_A 2 /* Affect only vertices in first
vgroup. */
+#define MOD_WVG_SET_B 3 /* Affect only vertices in second
vgroup. */
+#define MOD_WVG_SET_OR 4 /* Affect only vertices in one vgroup
or the other. */
+#define MOD_WVG_SET_AND 5 /* Affect only vertices in
both vgroups. */
typedef struct WeightVGProximityModifierData {
ModifierData modifier;
Modified:
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
2011-09-05 04:00:08 UTC (rev 39916)
+++ branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
2011-09-05 04:53:23 UTC (rev 39917)
@@ -394,7 +394,7 @@
}
else if (md->type == eModifierType_WeightVGMix) {
WeightVGMixModifierData *wmd= (WeightVGMixModifierData*)md;
- rna_object_vgroup_name_set(ptr, value, wmd->defgrp_name,
sizeof(wmd->defgrp_name));
+ rna_object_vgroup_name_set(ptr, value, wmd->defgrp_name_a,
sizeof(wmd->defgrp_name_a));
}
else if (md->type == eModifierType_WeightVGProximity) {
WeightVGProximityModifierData *wmd=
(WeightVGProximityModifierData*)md;
@@ -422,7 +422,7 @@
static void rna_WeightVGMixModifier_vgroup2_set(PointerRNA *ptr, const char
*value)
{
WeightVGMixModifierData *wmd= (WeightVGMixModifierData*)ptr->data;
- rna_object_vgroup_name_set(ptr, value, wmd->defgrp_name2,
sizeof(wmd->defgrp_name2));
+ rna_object_vgroup_name_set(ptr, value, wmd->defgrp_name_b,
sizeof(wmd->defgrp_name_b));
}
static void rna_MappingInfo_uvlayer_set(PointerRNA *ptr, const char *value)
@@ -2510,7 +2510,7 @@
prop= RNA_def_property(srna, "mask_constant", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
+ RNA_def_property_ui_range(prop, -1.0, 1.0, 10, 0);
RNA_def_property_ui_text(prop, "Influence", "Global influence of
current modifications on vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
@@ -2600,8 +2600,8 @@
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "default_weight", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
+ RNA_def_property_range(prop, 0.0, 1.0f);
+ RNA_def_property_ui_range(prop, 0.0, 1.0, 10, 0);
RNA_def_property_ui_text(prop, "Default Weight", "Default weight a
vertex will have if "
"it is not in the
vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
@@ -2641,16 +2641,16 @@
prop= RNA_def_property(srna, "add_threshold", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "add_threshold");
- RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
+ RNA_def_property_range(prop, 0.0, 1.0);
+ RNA_def_property_ui_range(prop, 0.0, 1.0, 10, 0);
RNA_def_property_ui_text(prop, "Add Threshold", "Lower bound for a
vertex's weight "
"to be added to the
vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "remove_threshold", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "rem_threshold");
- RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
+ RNA_def_property_range(prop, 0.0, 1.0);
+ RNA_def_property_ui_range(prop, 0.0, 1.0, 10, 0);
RNA_def_property_ui_text(prop, "Rem Threshold", "Upper bound for a
vertex's weight "
"to be removed from the
vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
@@ -2685,10 +2685,10 @@
static EnumPropertyItem weightvg_mix_set_items[] = {
{MOD_WVG_SET_ALL, "ALL", 0, "All vertices", ""},
- {MOD_WVG_SET_ORG, "ORG", 0, "Vertices from vgroup 1", ""},
- {MOD_WVG_SET_NEW, "NEW", 0, "Vertices from vgroup 2", ""},
- {MOD_WVG_SET_UNION, "UNION", 0, "Vertices from one group", ""},
- {MOD_WVG_SET_INTER, "INTER", 0, "Vertices from both groups",
""},
+ {MOD_WVG_SET_A, "A", 0, "Vertices from group A", ""},
+ {MOD_WVG_SET_B, "B", 0, "Vertices from group B", ""},
+ {MOD_WVG_SET_OR, "OR", 0, "Vertices from one group", ""},
+ {MOD_WVG_SET_AND, "AND", 0, "Vertices from both groups", ""},
{0, NULL, 0, NULL, NULL}};
StructRNA *srna;
@@ -2700,29 +2700,29 @@
RNA_def_struct_sdna(srna, "WeightVGMixModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_WEIGHTVG);
- prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
- RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
- RNA_def_property_ui_text(prop, "Vertex Group", "First vertex group
name.");
+ prop= RNA_def_property(srna, "vertex_group_a", PROP_STRING, PROP_NONE);
+ RNA_def_property_string_sdna(prop, NULL, "defgrp_name_a");
+ RNA_def_property_ui_text(prop, "Vertex Group A", "First vertex group
name.");
RNA_def_property_string_funcs(prop, NULL, NULL,
"rna_WeightVGModifier_vgroup_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop= RNA_def_property(srna, "vertex_group2", PROP_STRING, PROP_NONE);
- RNA_def_property_string_sdna(prop, NULL, "defgrp_name2");
- RNA_def_property_ui_text(prop, "Vertex Group 2", "Second vertex group
name.");
+ prop= RNA_def_property(srna, "vertex_group_b", PROP_STRING, PROP_NONE);
+ RNA_def_property_string_sdna(prop, NULL, "defgrp_name_b");
+ RNA_def_property_ui_text(prop, "Vertex Group B", "Second vertex group
name.");
RNA_def_property_string_funcs(prop, NULL, NULL,
"rna_WeightVGMixModifier_vgroup2_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop= RNA_def_property(srna, "default_weight", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
- RNA_def_property_ui_text(prop, "Default Weight", "Default weight a
vertex will have if "
+ prop= RNA_def_property(srna, "default_weight_a", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_range(prop, 0.0, 1.0f);
+ RNA_def_property_ui_range(prop, 0.0, 1.0, 10, 0);
+ RNA_def_property_ui_text(prop, "Default Weight A", "Default weight a
vertex will have if "
"it is not in the
first vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop= RNA_def_property(srna, "default_weight2", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
- RNA_def_property_ui_text(prop, "Default Weight 2", "Default weight a
vertex will have if "
+ prop= RNA_def_property(srna, "default_weight_b", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_range(prop, 0.0, 1.0f);
+ RNA_def_property_ui_range(prop, 0.0, 1.0, 10, 0);
+ RNA_def_property_ui_text(prop, "Default Weight B", "Default weight a
vertex will have if "
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
