Fix: 34874 Weight Paint UI inconsistent: removed conflicting shortcut definition...
authorGaia Clary <gaia.clary@machinimatrix.org>
Sat, 6 Apr 2013 10:52:52 +0000 (10:52 +0000)
committerGaia Clary <gaia.clary@machinimatrix.org>
Sat, 6 Apr 2013 10:52:52 +0000 (10:52 +0000)
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/sculpt_paint/paint_ops.c

index abfbe7efaa9a81fdea2511d42be43178d7282703..155be986ee1f7ac01e326dab92c78d9f54f567b2 100644 (file)
@@ -1641,6 +1641,12 @@ class VIEW3D_MT_pose_specials(Menu):
 
     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")
index 796bb99ebaf2b4fe269a3f46f6a8cc4d1ee36dea..f480725277e27905cb56d99cdb6f75701ebd08b8 100644 (file)
@@ -993,8 +993,6 @@ void ED_keymap_paint(wmKeyConfig *keyconf)
        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");