[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43397] trunk/blender: weight paint UI

[Campbell Barton]

Revision: 43397
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43397
Author:   campbellbarton
Date:     2012-01-15 13:23:57 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
weight paint UI
- 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.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/animsys_refactor.py
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c

Modified: trunk/blender/release/scripts/modules/animsys_refactor.py
===================================================================
--- trunk/blender/release/scripts/modules/animsys_refactor.py	2012-01-15 12:35:40 UTC (rev 43396)
+++ trunk/blender/release/scripts/modules/animsys_refactor.py	2012-01-15 13:23:57 UTC (rev 43397)
@@ -532,8 +532,6 @@
     ("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"),

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-01-15 12:35:40 UTC (rev 43396)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-01-15 13:23:57 UTC (rev 43397)
@@ -1070,9 +1070,10 @@
         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':

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2012-01-15 12:35:40 UTC (rev 43396)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2012-01-15 13:23:57 UTC (rev 43397)
@@ -797,12 +797,12 @@
 
 /* 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 */

Modified: trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2012-01-15 12:35:40 UTC (rev 43396)
+++ trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2012-01-15 13:23:57 UTC (rev 43397)
@@ -289,6 +289,7 @@
 	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 @@
 	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 @@
 	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)