[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32187] trunk/blender: Fix #24054: Shift+A add menu in Surface editmode shows curve items.

[Sergey Sharybin]

Revision: 32187
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32187
Author:   nazgul
Date:     2010-09-29 13:48:03 +0200 (Wed, 29 Sep 2010)

Log Message:
-----------
Fix #24054: Shift+A add menu in Surface editmode shows curve items.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/source/blender/editors/curve/curve_ops.c

Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py	2010-09-29 11:09:11 UTC (rev 32186)
+++ trunk/blender/release/scripts/ui/space_info.py	2010-09-29 11:48:03 UTC (rev 32187)
@@ -189,7 +189,22 @@
         layout.operator("curve.primitive_nurbs_circle_add", icon='CURVE_NCIRCLE', text="Nurbs Circle")
         layout.operator("curve.primitive_nurbs_path_add", icon='CURVE_PATH', text="Path")
 
+class INFO_MT_edit_curve_add(bpy.types.Menu):
+    bl_idname = "INFO_MT_edit_curve_add"
+    bl_label = "Add"
 
+    def draw(self, context):
+        is_surf = context.active_object.type == 'SURFACE'
+
+        layout = self.layout
+        layout.operator_context = 'INVOKE_REGION_WIN'
+
+        if is_surf:
+          INFO_MT_surface_add.draw(self, context)
+        else:
+          INFO_MT_curve_add.draw(self, context)
+
+
 class INFO_MT_surface_add(bpy.types.Menu):
     bl_idname = "INFO_MT_surface_add"
     bl_label = "Surface"

Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c	2010-09-29 11:09:11 UTC (rev 32186)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c	2010-09-29 11:48:03 UTC (rev 32187)
@@ -193,7 +193,7 @@
 	keymap= WM_keymap_find(keyconf, "Curve", 0, 0);
 	keymap->poll= ED_operator_editsurfcurve;
 
-    WM_keymap_add_menu(keymap, "INFO_MT_curve_add", AKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_menu(keymap, "INFO_MT_edit_curve_add", AKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "CURVE_OT_vertex_add", LEFTMOUSE, KM_CLICK, KM_CTRL, 0);
 
 	WM_keymap_add_item(keymap, "CURVE_OT_select_all", AKEY, KM_PRESS, 0, 0);