[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39996] trunk/blender: interface + naming improvements to vertex wright modifier
Campbell Barton
ideasman42 at gmail.com
Wed Sep 7 09:46:27 CEST 2011
Revision: 39996
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39996
Author: campbellbarton
Date: 2011-09-07 07:46:26 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
interface + naming improvements to vertex wright modifier
- WeightVG -> Vertex Weight
- mapping_mode -> falloff_type
- nicer layout for VertexWeightModifiers add/remove options
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/source/blender/editors/include/UI_icons.h
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_weightvg_util.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
Modified: trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst
===================================================================
--- trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst 2011-09-07 07:29:29 UTC (rev 39995)
+++ trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst 2011-09-07 07:46:26 UTC (rev 39996)
@@ -100,7 +100,23 @@
Don't Use Blender!
==================
+While developing your own scripts blenders interface can get in the way, manually reloading, running the scripts, opening file import etc is just overhead.
+For scripts that are not interactive it can end up being easier not to use blender at all and run blender from a terminal, without opening a window and execute the script on the command line.
+
+.. code-block::
+
+ blender --backgruond --python myscript.py
+
+
+You might want to run this with a blend file too.
+
+.. code-block::
+
+ blender myscene.blend --backgruond --python myscript.py
+
+
+
Use External Tools
==================
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-07 07:29:29 UTC (rev 39995)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-07 07:46:26 UTC (rev 39996)
@@ -768,7 +768,7 @@
elif md.mask_tex_mapping == 'UV' and ob.type == 'MESH':
layout.prop_search(md, "mask_tex_uv_layer", ob.data, "uv_textures")
- def WEIGHT_VGEDIT(self, layout, ob, md):
+ def VERTEX_WEIGHT_EDIT(self, layout, ob, md):
if ob.type == 'MESH':
split = layout.split()
col = split.column()
@@ -779,25 +779,28 @@
col.label(text="Default Weight:")
col.prop(md, "default_weight", text="")
- layout.prop(md, "mapping_mode")
- if md.mapping_mode == 'CURVE':
+ layout.prop(md, "falloff_type")
+ if md.falloff_type == 'CURVE':
col = layout.column()
col.template_curve_mapping(md, "map_curve")
- row = layout.row()
- row.prop(md, "use_add")
- row.prop(md, "use_remove")
- row = layout.row()
- if md.use_add:
- row.prop(md, "add_threshold")
- if md.use_remove:
- row.prop(md, "remove_threshold")
+ split = layout.split(percentage=0.4)
+ split.prop(md, "use_add")
+ row = split.row()
+ row.active = md.use_add
+ row.prop(md, "add_threshold")
+ split = layout.split(percentage=0.4)
+ split.prop(md, "use_remove")
+ row = split.row()
+ row.active = md.use_remove
+ row.prop(md, "remove_threshold")
+
# Common mask options…
layout.separator()
self.weight_vg_mask(layout, ob, md)
- def WEIGHT_VGMIX(self, layout, ob, md):
+ def VERTEX_WEIGHT_MIX(self, layout, ob, md):
if ob.type == 'MESH':
split = layout.split()
col = split.column()
@@ -822,7 +825,7 @@
layout.separator()
self.weight_vg_mask(layout, ob, md)
- def WEIGHT_VGPROXIMITY(self, layout, ob, md):
+ def VERTEX_WEIGHT_PROXIMITY(self, layout, ob, md):
if ob.type == 'MESH':
split = layout.split()
col = split.column()
@@ -843,7 +846,7 @@
row.prop(md, "min_dist")
row.prop(md, "max_dist")
- layout.prop(md, "mapping_mode")
+ layout.prop(md, "falloff_type")
# Common mask options…
layout.separator()
Modified: trunk/blender/source/blender/editors/include/UI_icons.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_icons.h 2011-09-07 07:29:29 UTC (rev 39995)
+++ trunk/blender/source/blender/editors/include/UI_icons.h 2011-09-07 07:46:26 UTC (rev 39996)
@@ -589,7 +589,7 @@
DEF_ICON(MOD_SMOKE)
DEF_ICON(MOD_SOLIDIFY)
DEF_ICON(MOD_SCREW)
-DEF_ICON(MOD_WEIGHTVG)
+DEF_ICON(MOD_VERTEX_WEIGHT)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK161)
DEF_ICON(BLANK162)
Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2011-09-07 07:29:29 UTC (rev 39995)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2011-09-07 07:46:26 UTC (rev 39996)
@@ -796,7 +796,7 @@
char defgrp_name[32]; /* Name of vertex group to edit. */
short edit_flags; /* Using MOD_WVG_EDIT_* flags. */
- short mapping_mode; /* Using MOD_WVG_MAPPING_* defines. */
+ short falloff_type; /* Using MOD_WVG_MAPPING_* defines. */
float default_weight; /* Weight for vertices not in vgroup. */
/* Mapping stuff. */
@@ -913,7 +913,7 @@
float min_dist, max_dist; /* Distances mapping to 0.0/1.0 weights. */
/* Put here to avoid breaking existing struct... */
- short mapping_mode; /* Using MOD_WVG_MAPPING_* defines. */
+ short falloff_type; /* Using MOD_WVG_MAPPING_* defines. */
/* Padding... */
short pad_s1;
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-09-07 07:29:29 UTC (rev 39995)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-09-07 07:46:26 UTC (rev 39996)
@@ -69,9 +69,9 @@
{eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""},
{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""},
{eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""},
- {eModifierType_WeightVGEdit, "WEIGHT_VGEDIT", ICON_MOD_WEIGHTVG, "WeightVG Edit", ""},
- {eModifierType_WeightVGMix, "WEIGHT_VGMIX", ICON_MOD_WEIGHTVG, "WeightVG Mix", ""},
- {eModifierType_WeightVGProximity, "WEIGHT_VGPROXIMITY", ICON_MOD_WEIGHTVG, "WeightVG Proximity", ""},
+ {eModifierType_WeightVGEdit, "VERTEX_WEIGHT_EDIT", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Edit", ""},
+ {eModifierType_WeightVGMix, "VERTEX_WEIGHT_MIX", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Mix", ""},
+ {eModifierType_WeightVGProximity, "VERTEX_WEIGHT_PROXIMITY", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Proximity", ""},
{0, "", 0, "Deform", ""},
{eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
{eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
@@ -188,11 +188,11 @@
case eModifierType_Warp:
return &RNA_WarpModifier;
case eModifierType_WeightVGEdit:
- return &RNA_WeightVGEditModifier;
+ return &RNA_VertexWeightEditModifier;
case eModifierType_WeightVGMix:
- return &RNA_WeightVGMixModifier;
+ return &RNA_VertexWeightMixModifier;
case eModifierType_WeightVGProximity:
- return &RNA_WeightVGProximityModifier;
+ return &RNA_VertexWeightProximityModifier;
default:
return &RNA_Modifier;
}
@@ -2552,7 +2552,7 @@
static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
{
- static EnumPropertyItem weightvg_edit_mapping_mode_items[] = {
+ static EnumPropertyItem weightvg_edit_falloff_type_items[] = {
{MOD_WVG_MAPPING_NONE, "LINEAR", ICON_LINCURVE, "Linear", ""},
{MOD_WVG_MAPPING_CURVE, "CURVE", ICON_RNDCURVE, "Custom Curve", ""},
{MOD_WVG_MAPPING_SHARP, "SHARP", ICON_SHARPCURVE, "Sharp", ""},
@@ -2566,11 +2566,11 @@
StructRNA *srna;
PropertyRNA *prop;
- srna= RNA_def_struct(brna, "WeightVGEditModifier", "Modifier");
+ srna= RNA_def_struct(brna, "VertexWeightEditModifier", "Modifier");
RNA_def_struct_ui_text(srna, "WeightVG Edit Modifier",
"Edit the weights of vertices in a group.");
RNA_def_struct_sdna(srna, "WeightVGEditModifierData");
- RNA_def_struct_ui_icon(srna, ICON_MOD_WEIGHTVG);
+ RNA_def_struct_ui_icon(srna, ICON_MOD_VERTEX_WEIGHT);
prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
@@ -2578,9 +2578,9 @@
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, "mapping_mode", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_items(prop, weightvg_edit_mapping_mode_items);
- RNA_def_property_ui_text(prop, "Mapping Mode", "How weights are mapped to there new values.");
+ prop= RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, weightvg_edit_falloff_type_items);
+ RNA_def_property_ui_text(prop, "Falloff Type", "How weights are mapped to there new values.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "use_add", PROP_BOOLEAN, PROP_NONE);
@@ -2650,11 +2650,11 @@
StructRNA *srna;
PropertyRNA *prop;
- srna= RNA_def_struct(brna, "WeightVGMixModifier", "Modifier");
+ srna= RNA_def_struct(brna, "VertexWeightMixModifier", "Modifier");
RNA_def_struct_ui_text(srna, "WeightVG Mix Modifier",
"Mix the weights of two vertex groups.");
RNA_def_struct_sdna(srna, "WeightVGMixModifierData");
- RNA_def_struct_ui_icon(srna, ICON_MOD_WEIGHTVG);
+ RNA_def_struct_ui_icon(srna, ICON_MOD_VERTEX_WEIGHT);
prop= RNA_def_property(srna, "vertex_group_a", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name_a");
@@ -2712,7 +2712,7 @@
{MOD_WVG_PROXIMITY_GEOM_FACES, "FACE", ICON_FACESEL, "Face", ""},
{0, NULL, 0, NULL, NULL}};
- static EnumPropertyItem weightvg_proximity_mapping_mode_items[] = {
+ static EnumPropertyItem weightvg_proximity_falloff_type_items[] = {
{MOD_WVG_MAPPING_NONE, "LINEAR", ICON_LINCURVE, "Linear", ""},
/* No curve mapping here! */
{MOD_WVG_MAPPING_SHARP, "SHARP", ICON_SHARPCURVE, "Sharp", ""},
@@ -2726,12 +2726,12 @@
StructRNA *srna;
PropertyRNA *prop;
- srna= RNA_def_struct(brna, "WeightVGProximityModifier", "Modifier");
+ srna= RNA_def_struct(brna, "VertexWeightProximityModifier", "Modifier");
RNA_def_struct_ui_text(srna, "WeightVG Proximity Modifier",
"Set the weights of vertices in a group from a target object's "
"distance.");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list