[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40031] branches/bmesh/blender/release: svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/ blender/release --accept theirs-full
Campbell Barton
ideasman42 at gmail.com
Thu Sep 8 09:23:01 CEST 2011
Revision: 40031
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40031
Author: campbellbarton
Date: 2011-09-08 07:23:01 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender/release --accept theirs-full
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39990
Modified Paths:
--------------
branches/bmesh/blender/release/datafiles/blenderbuttons
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
Property Changed:
----------------
branches/bmesh/blender/release/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/blender/release:31524-39991
Modified: branches/bmesh/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39990
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-08 07:05:27 UTC (rev 40030)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-08 07:23:01 UTC (rev 40031)
@@ -741,5 +741,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: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39990
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39990
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list