weight paint UI
authorCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jan 2012 13:23:57 +0000 (13:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jan 2012 13:23:57 +0000 (13:23 +0000)
- added back 2.4x 'Vgroup' option to the UI, restricts painting to verts already in the group.
- remove 'All Faces' button in weight paint mode. it doesn't do anything.

release/scripts/modules/animsys_refactor.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_sculpt_paint.c

index 8db21e357d99da99a25aedee74f33465ba5c6a3e..097a0296a8ed19f0c105375cc122913b4913c737 100644 (file)
@@ -532,8 +532,6 @@ data_2_56_to_2_59 = (
     ("ShaderNodeMapping", "minimum", "min"),
     ("ShaderNodeMapping", "clamp_maximum", "use_max"),
     ("ShaderNodeMapping", "clamp_minimum", "use_min"),
-    ("VertexPaint", "all_faces", "use_all_faces"),
-    ("VertexPaint", "spray", "use_spray"),
     ("ParticleEdit", "add_keys", "default_key_count"),
     ("ParticleEdit", "selection_mode", "select_mode"),
     ("ParticleEdit", "auto_velocity", "use_auto_velocity"),
index 1e537c23ea3011519402243b38433a00038e4c6b..248452a0e8c35bf0a9158969ad1a1115c424cf8b 100644 (file)
@@ -1070,9 +1070,10 @@ class VIEW3D_PT_tools_weightpaint_options(PaintPanel, Panel):
         wpaint = tool_settings.weight_paint
 
         col = layout.column()
-        col.prop(wpaint, "use_all_faces")
+
         col.prop(wpaint, "use_normal")
         col.prop(wpaint, "use_spray")
+        col.prop(wpaint, "use_group_restrict")
 
         obj = context.weight_paint_object
         if obj.type == 'MESH':
index a2dfea11cdbd9909a49b0c3e7b9f4a919ef2bf8c..684f2a54b81701bf300f6f52e58ce0179fc67841 100644 (file)
@@ -797,12 +797,12 @@ typedef struct VPaint {
 
 /* VPaint flag */
 #define VP_COLINDEX    1
-#define VP_AREA                2
+#define VP_AREA                2  /* vertex paint only */
 
 #define VP_NORMALS     8
 #define VP_SPRAY       16
 // #define VP_MIRROR_X 32 // deprecated in 2.5x use (me->editflag & ME_EDIT_MIRROR_X)
-#define VP_ONLYVGROUP  128
+#define VP_ONLYVGROUP  128  /* weight paint only */
 
 /* *************************************************************** */
 /* Transform Orientations */
index a15ca5de5c19e571387fc96f59b789525dd1de42..cd929d3aeda2191d554ab3dae0c5302926694270 100644 (file)
@@ -289,6 +289,7 @@ static void rna_def_sculpt(BlenderRNA  *brna)
        RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Sculpt_update");
 }
 
+/* use for weight paint too */
 static void rna_def_vertex_paint(BlenderRNA *brna)
 {
        StructRNA *srna;
@@ -297,7 +298,8 @@ static void rna_def_vertex_paint(BlenderRNA *brna)
        srna= RNA_def_struct(brna, "VertexPaint", "Paint");
        RNA_def_struct_sdna(srna, "VPaint");
        RNA_def_struct_ui_text(srna, "Vertex Paint", "Properties of vertex and weight paint mode");
-       
+
+       /* vertex paint only */
        prop= RNA_def_property(srna, "use_all_faces", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_AREA);
        RNA_def_property_ui_text(prop, "All Faces", "Paint on all faces inside brush");
@@ -309,6 +311,11 @@ static void rna_def_vertex_paint(BlenderRNA *brna)
        prop= RNA_def_property(srna, "use_spray", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_SPRAY);
        RNA_def_property_ui_text(prop, "Spray", "Keep applying paint effect while holding mouse");
+
+       /* weight paint only */
+       prop= RNA_def_property(srna, "use_group_restrict", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_ONLYVGROUP);
+       RNA_def_property_ui_text(prop, "Restrict", "Restrict painting to verts already apart of the vertex group");
 }
 
 static void rna_def_image_paint(BlenderRNA *brna)