[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53979] trunk/blender/release/scripts/ startup/bl_ui/space_view3d.py: fix for error where linking objects to the scene would show the popup if activated from the object menu .

[Campbell Barton]

Revision: 53979
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53979
Author:   campbellbarton
Date:     2013-01-22 04:54:31 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
fix for error where linking objects to the scene would show the popup if activated from the object menu.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-01-22 04:24:01 UTC (rev 53978)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-01-22 04:54:31 UTC (rev 53979)
@@ -1066,12 +1066,14 @@
 
     def draw(self, context):
         layout = self.layout
-
+        operator_context_default = layout.operator_context
         if(len(bpy.data.scenes) > 10):
-            layout.operator_context = 'INVOKE_DEFAULT'
+            layout.operator_context = 'INVOKE_REGION_WIN'
             layout.operator("object.make_links_scene", text="Objects to Scene...", icon='OUTLINER_OB_EMPTY')
         else:
+            layout.operator_context = 'EXEC_REGION_WIN'
             layout.operator_menu_enum("object.make_links_scene", "scene", text="Objects to Scene...")
+        layout.operator_context = operator_context_default
 
         layout.operator_enum("object.make_links_data", "type")  # inline