[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39991] trunk/blender: Merging r39693 through r39989 from vgroup_modifiers branch into trunk.
Bastien Montagne
montagne29 at wanadoo.fr
Wed Sep 7 08:33:29 CEST 2011
Revision: 39991
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39991
Author: mont29
Date: 2011-09-07 06:33:29 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Merging r39693 through r39989 from vgroup_modifiers branch into trunk.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39693
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39989
Modified Paths:
--------------
trunk/blender/release/datafiles/blenderbuttons
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/datafiles/blenderbuttons.c
trunk/blender/source/blender/editors/include/UI_icons.h
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/MOD_modifiertypes.h
trunk/blender/source/blender/modifiers/intern/MOD_util.c
Added Paths:
-----------
trunk/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvg_util.h
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
Property Changed:
----------------
trunk/blender/
trunk/blender/release/scripts/modules/bpy/ops.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/presets/sss/chicken.py
trunk/blender/release/scripts/presets/sss/cream.py
trunk/blender/release/scripts/presets/sss/ketchup.py
trunk/blender/release/scripts/presets/sss/marble.py
trunk/blender/release/scripts/presets/sss/potato.py
trunk/blender/release/scripts/presets/sss/skim_milk.py
trunk/blender/release/scripts/presets/sss/skin1.py
trunk/blender/release/scripts/presets/sss/skin2.py
trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_material.py
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
trunk/blender/release/scripts/startup/bl_ui/properties_world.py
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/source/blender/blenkernel/BKE_customdata_file.h
trunk/blender/source/blender/blenkernel/intern/customdata_file.c
trunk/blender/source/blender/editors/datafiles/startup.blend.c
trunk/blender/source/blender/editors/include/ED_particle.h
trunk/blender/source/blender/editors/include/ED_physics.h
trunk/blender/source/blender/editors/include/ED_render.h
trunk/blender/source/blender/editors/include/ED_transform.h
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_group.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/object/object_shapekey.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/particle_boids.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/physics/physics_pointcache.c
trunk/blender/source/blender/editors/render/
trunk/blender/source/blender/editors/render/render_intern.h
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/render/render_update.c
trunk/blender/source/blender/editors/sculpt_paint/
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_info/info_ops.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_state.c
trunk/blender/source/blender/editors/space_outliner/
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_userpref/
trunk/blender/source/blender/editors/space_userpref/space_userpref.c
trunk/blender/source/blender/editors/space_userpref/userpref_intern.h
trunk/blender/source/blender/editors/space_userpref/userpref_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c
trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.h
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/gpu/GPU_buffers.h
trunk/blender/source/blender/makesdna/DNA_outliner_types.h
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
Property changes on: trunk/blender
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/vgroup_modifiers:38694-39989
Modified: trunk/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/scripts/modules/bpy/ops.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/modules/bpy/utils.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/chicken.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/cream.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/ketchup.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/marble.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/potato.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/skim_milk.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/skin1.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/presets/sss/skin2.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
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 06:17:28 UTC (rev 39990)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-07 06:33:29 UTC (rev 39991)
@@ -737,5 +737,117 @@
col.prop(md, "width", slider=True)
col.prop(md, "narrowness", slider=True)
+ @staticmethod
+ def weight_vg_mask(layout, ob, md):
+ layout.label(text="Influence/Mask Options:")
+ split = layout.split()
+ col1 = split.column()
+ col2 = split.column()
+
+ col1.label(text="Global Influence:")
+ col2.prop(md, "mask_constant", text="")
+
+ if not md.mask_texture:
+ col1.label(text="Vertex Group Mask:")
+ col2.prop_search(md, "mask_vertex_group", ob, "vertex_groups", text="")
+
+ if not md.mask_vertex_group:
+ col1.label(text="Texture Mask:")
+ col2.template_ID(md, "mask_texture", new="texture.new")
+ if md.mask_texture:
+ split = layout.split()
+ col = split.column()
+ col.label(text="Texture Coordinates:")
+ col.prop(md, "mask_tex_mapping", text="")
+ col = split.column()
+ col.label(text="Use Channel:")
+ col.prop(md, "mask_tex_use_channel", text="")
+
+ if md.mask_tex_mapping == 'OBJECT':
+ layout.prop(md, "mask_tex_map_object", text="Object")
+ 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):
+ if ob.type == 'MESH':
+ split = layout.split()
+ col = split.column()
+ col.label(text="Vertex Group:")
+ col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
+
+ col = split.column()
+ col.label(text="Default Weight:")
+ col.prop(md, "default_weight", text="")
+
+ layout.prop(md, "mapping_mode")
+ if md.mapping_mode == '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")
+
+ # Common mask options…
+ layout.separator()
+ self.weight_vg_mask(layout, ob, md)
+
+ def WEIGHT_VGMIX(self, layout, ob, md):
+ if ob.type == 'MESH':
+ split = layout.split()
+ col = split.column()
+ 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 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="")
+
+ # Common mask options…
+ layout.separator()
+ self.weight_vg_mask(layout, ob, md)
+
+ def WEIGHT_VGPROXIMITY(self, layout, ob, md):
+ if ob.type == 'MESH':
+ split = layout.split()
+ col = split.column()
+ col.label(text="Vertex Group:")
+ col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
+
+ col = split.column()
+ col.label(text="Target Object:")
+ col.prop(md, "target", text="")
+
+ row = layout.row()
+ row.prop(md, "proximity_mode", expand=True)
+ if md.proximity_mode == 'GEOMETRY':
+ row = layout.row()
+ row.prop(md, "proximity_geometry", expand=True)
+
+ row = layout.split()
+ row.prop(md, "min_dist")
+ row.prop(md, "max_dist")
+
+ layout.prop(md, "mapping_mode")
+
+ # Common mask options…
+ layout.separator()
+ self.weight_vg_mask(layout, ob, md)
+
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/blender/release/scripts/startup/bl_ui/properties_world.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list