[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39492] branches/vgroup_modifiers: vgroup_modifiers: Removed (commented out, for now) addtionnal mapping/ clamping options in WeightVGEdit mod, leaving the only curve mapping stuff.
Bastien Montagne
montagne29 at wanadoo.fr
Wed Aug 17 15:07:51 CEST 2011
Revision: 39492
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39492
Author: mont29
Date: 2011-08-17 13:07:51 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
vgroup_modifiers: Removed (commented out, for now) addtionnal mapping/clamping options in WeightVGEdit mod, leaving the only curve mapping stuff.
Also, updated all three modifiers with new foreachTexLink walking func.
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_weightvgedit.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgproximity.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-08-17 13:04:28 UTC (rev 39491)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-08-17 13:07:51 UTC (rev 39492)
@@ -779,31 +779,31 @@
col.label(text="Default Weight:")
col.prop(md, "default_weight", text="")
- layout.prop(md, "use_map")
- if md.use_map:
- split = layout.split()
- col = split.column()
- col.label("Input:")
- col.label("Output:")
- col = split.column()
- col.prop(md, "map_input_low", text="Min")
- col.prop(md, "map_output_low", text="Min")
- col = split.column()
- col.prop(md, "map_input_high", text="Max")
- col.prop(md, "map_output_high", text="Max")
+# layout.prop(md, "use_map")
+# if md.use_map:
+# split = layout.split()
+# col = split.column()
+# col.label("Input:")
+# col.label("Output:")
+# col = split.column()
+# col.prop(md, "map_input_low", text="Min")
+# col.prop(md, "map_output_low", text="Min")
+# col = split.column()
+# col.prop(md, "map_input_high", text="Max")
+# col.prop(md, "map_output_high", text="Max")
layout.prop(md, "use_map_curve")
if md.use_map_curve:
col = layout.column()
col.template_curve_mapping(md, "map_curve")
- layout.prop(md, "use_reverse")
+# layout.prop(md, "use_reverse")
- layout.prop(md, "use_clamp")
- if md.use_clamp:
- row = layout.row()
- row.prop(md, "clamp_weight_min")
- row.prop(md, "clamp_weight_max")
+# layout.prop(md, "use_clamp")
+# if md.use_clamp:
+# row = layout.row()
+# row.prop(md, "clamp_weight_min")
+# row.prop(md, "clamp_weight_max")
row = layout.row()
row.prop(md, "use_add")
Modified: branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h 2011-08-17 13:04:28 UTC (rev 39491)
+++ branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h 2011-08-17 13:07:51 UTC (rev 39492)
@@ -803,15 +803,15 @@
float default_weight; /* Weight for vertices not in vgroup. */
/* Mapping stuff. */
- float map_org_min, map_org_max;
- float map_new_min, map_new_max;
+ float map_org_min, map_org_max; /* Deprecated, keeping for file compatibility for now... */
+ float map_new_min, map_new_max; /* Deprecated, keeping for file compatibility for now... */
struct CurveMapping *cmap_curve; /* The custom mapping curve! */
/* The add/remove vertices weight thresholds. */
float add_threshold, rem_threshold;
/* Clamping options. */
- float clamp_weight_min, clamp_weight_max;
+ float clamp_weight_min, clamp_weight_max; /* Deprecated, keeping for file compatibility for now... */
/* Masking options. */
float mask_constant; /* The global “influence”, if no vgroup nor tex is used as mask. */
@@ -832,17 +832,17 @@
/* WeightVGEdit flags. */
/* Use parametric mapping. */
-#define MOD_WVG_EDIT_MAP (1 << 0)
+//#define MOD_WVG_EDIT_MAP (1 << 0)
/* Use curve mapping. */
#define MOD_WVG_EDIT_CMAP (1 << 1)
/* Reverse weights (in the [0.0, 1.0] standard range). */
-#define MOD_WVG_EDIT_REVERSE_WEIGHTS (1 << 2)
+//#define MOD_WVG_EDIT_REVERSE_WEIGHTS (1 << 2)
/* Add vertices with higher weight than threshold to vgroup. */
#define MOD_WVG_EDIT_ADD2VG (1 << 3)
/* Remove vertices with lower weight than threshold from vgroup. */
#define MOD_WVG_EDIT_REMFVG (1 << 4)
/* Clamp weights. */
-#define MOD_WVG_EDIT_CLAMP (1 << 5)
+//#define MOD_WVG_EDIT_CLAMP (1 << 5)
typedef struct WeightVGMixModifierData {
ModifierData modifier;
Modified: branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c 2011-08-17 13:04:28 UTC (rev 39491)
+++ branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c 2011-08-17 13:07:51 UTC (rev 39492)
@@ -2565,20 +2565,20 @@
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, "use_map", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_MAP);
- RNA_def_property_ui_text(prop, "Map", "Map vertex group weights.");
- RNA_def_property_update(prop, 0, "rna_Modifier_update");
+/* prop= RNA_def_property(srna, "use_map", PROP_BOOLEAN, PROP_NONE);*/
+/* RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_MAP);*/
+/* RNA_def_property_ui_text(prop, "Map", "Map vertex group weights.");*/
+/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "use_map_curve", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_CMAP);
RNA_def_property_ui_text(prop, "Curve Map", "Map vertex group weights with a curve.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop= RNA_def_property(srna, "use_reverse", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_REVERSE_WEIGHTS);
- RNA_def_property_ui_text(prop, "Reverse", "Reverse vertex group weights.");
- RNA_def_property_update(prop, 0, "rna_Modifier_update");
+/* prop= RNA_def_property(srna, "use_reverse", PROP_BOOLEAN, PROP_NONE);*/
+/* RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_REVERSE_WEIGHTS);*/
+/* RNA_def_property_ui_text(prop, "Reverse", "Reverse vertex group weights.");*/
+/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "use_add", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_ADD2VG);
@@ -2592,10 +2592,10 @@
"from vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop= RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_CLAMP);
- RNA_def_property_ui_text(prop, "Clamp", "Clamp vertex group weights.");
- RNA_def_property_update(prop, 0, "rna_Modifier_update");
+/* prop= RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);*/
+/* RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_CLAMP);*/
+/* RNA_def_property_ui_text(prop, "Clamp", "Clamp vertex group weights.");*/
+/* 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);
@@ -2604,33 +2604,33 @@
"it is not in the vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop= RNA_def_property(srna, "map_input_low", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "map_org_min");
- 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, "Input Low Weight", "Low input mapping value.");
- RNA_def_property_update(prop, 0, "rna_Modifier_update");
+/* prop= RNA_def_property(srna, "map_input_low", PROP_FLOAT, PROP_NONE);*/
+/* RNA_def_property_float_sdna(prop, NULL, "map_org_min");*/
+/* 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, "Input Low Weight", "Low input mapping value.");*/
+/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
- prop= RNA_def_property(srna, "map_input_high", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "map_org_max");
- 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, "Input High Weight", "High input mapping value.");
- RNA_def_property_update(prop, 0, "rna_Modifier_update");
+/* prop= RNA_def_property(srna, "map_input_high", PROP_FLOAT, PROP_NONE);*/
+/* RNA_def_property_float_sdna(prop, NULL, "map_org_max");*/
+/* 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, "Input High Weight", "High input mapping value.");*/
+/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
- prop= RNA_def_property(srna, "map_output_low", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "map_new_min");
- 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, "Output Low Weight", "Low output mapping value.");
- RNA_def_property_update(prop, 0, "rna_Modifier_update");
+/* prop= RNA_def_property(srna, "map_output_low", PROP_FLOAT, PROP_NONE);*/
+/* RNA_def_property_float_sdna(prop, NULL, "map_new_min");*/
+/* 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, "Output Low Weight", "Low output mapping value.");*/
+/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
- prop= RNA_def_property(srna, "map_output_high", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "map_new_max");
- 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, "Output High Weight", "High output mapping value.");
- RNA_def_property_update(prop, 0, "rna_Modifier_update");
+/* prop= RNA_def_property(srna, "map_output_high", PROP_FLOAT, PROP_NONE);*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list