[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55838] trunk/blender: Fix: 34874 Weight Paint UI inconsistent: removed conflicting shortcut definition, added weight assign tools to specials menu

[Gaia Clary]

Revision: 55838
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55838
Author:   gaiaclary
Date:     2013-04-06 10:52:52 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Fix: 34874 Weight Paint UI inconsistent: removed conflicting shortcut definition, added weight assign tools to specials menu

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-04-06 08:22:39 UTC (rev 55837)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-04-06 10:52:52 UTC (rev 55838)
@@ -1641,6 +1641,12 @@
 
     def draw(self, context):
         layout = self.layout
+        
+        layout.operator("paint.weight_from_bones", text="Assign Automatic from Bones").type="AUTOMATIC"
+        layout.operator("paint.weight_from_bones", text="Assign from Bone Envelopes").type="ENVELOPES"
+        
+        layout.separator()
+        
         layout.operator("pose.select_constraint_target")
         layout.operator("pose.flip_names")
         layout.operator("pose.paths_calculate")

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-04-06 08:22:39 UTC (rev 55837)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-04-06 10:52:52 UTC (rev 55838)
@@ -993,8 +993,6 @@
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", VKEY, KM_PRESS, 0, 0); /* vert mask toggle */
 	RNA_string_set(kmi->ptr, "data_path", "weight_paint_object.data.use_paint_mask_vertex");
 
-	WM_keymap_verify_item(keymap, "PAINT_OT_weight_from_bones", WKEY, KM_PRESS, 0, 0);
-
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SKEY, KM_PRESS, KM_SHIFT, 0);
 	RNA_string_set(kmi->ptr, "data_path", "tool_settings.weight_paint.brush.use_smooth_stroke");