[Bf-extensions-cvs] [0a1666df] master: space_view3d_spacebar_menu: fix various errors
meta-androcto
noreply at git.blender.org
Sun Apr 28 07:25:27 CEST 2019
Commit: 0a1666df9d6a5f17c4d4c2edab95610c3e49474d
Author: meta-androcto
Date: Sun Apr 28 15:25:03 2019 +1000
Branches: master
https://developer.blender.org/rBA0a1666df9d6a5f17c4d4c2edab95610c3e49474d
space_view3d_spacebar_menu: fix various errors
===================================================================
M space_view3d_spacebar_menu.py
===================================================================
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 716827f5..cba6848b 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -55,7 +55,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
settings = context.tool_settings
layout.operator_context = 'INVOKE_REGION_WIN'
obj = context.active_object
-
+ view = context.space_data
# No Object Selected #
if not obj:
@@ -72,8 +72,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
text="Cursor to Grid")
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL')
@@ -107,10 +107,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.operator("object.delete", text="Delete Object", icon='X')
UseSeparator(self, context)
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
- layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='EDITMODE_HLT')
+ layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Mesh Edit Mode #
if obj and obj.type == 'MESH' and obj.mode in {'EDIT'}:
@@ -139,10 +139,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_edit_mesh_delete", icon='X')
UseSeparator(self, context)
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
- layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='EDITMODE_HLT')
+ layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Sculpt Mode #
if obj and obj.type == 'MESH' and obj.mode in {'SCULPT'}:
@@ -159,10 +159,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_Sculpt_Specials", icon='SOLO_OFF')
UseSeparator(self, context)
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
- layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='EDITMODE_HLT')
+ layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Vertex Paint #
if obj and obj.type == 'MESH' and obj.mode in {'VERTEX_PAINT'}:
@@ -173,14 +173,14 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
UseSeparator(self, context)
# layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
layout.menu("VIEW3D_MT_Brush_Selection",
- text="Vertex Paint Tool", icon='BRUSH_VERTEXDRAW')
+ text="Vertex Paint Tool")
layout.menu("VIEW3D_MT_Vertex_Colors", icon='GROUP_VCOL')
UseSeparator(self, context)
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
- layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='EDITMODE_HLT')
+ layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Weight Paint Menu #
if obj and obj.type == 'MESH' and obj.mode in {'WEIGHT_PAINT'}:
@@ -195,10 +195,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
text="Weight Paint Tool", icon='BRUSH_TEXMASK')
UseSeparator(self, context)
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
- layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='EDITMODE_HLT')
+ layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Texture Paint #
if obj and obj.type == 'MESH' and obj.mode in {'TEXTURE_PAINT'}:
@@ -211,10 +211,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
text="Texture Paint Tool", icon='SCULPTMODE_HLT')
UseSeparator(self, context)
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
- layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='EDITMODE_HLT')
+ layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Curve Object Mode #
if obj and obj.type == 'CURVE' and obj.mode in {'OBJECT'}:
@@ -247,8 +247,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Edit Curve #
if obj and obj.type == 'CURVE' and obj.mode in {'EDIT'}:
@@ -277,8 +277,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Surface Object Mode #
if obj and obj.type == 'SURFACE' and obj.mode in {'OBJECT'}:
@@ -310,8 +310,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Edit Surface #
if obj and obj.type == 'SURFACE' and obj.mode in {'EDIT'}:
@@ -340,8 +340,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Metaball Object Mode #
if obj and obj.type == 'META' and obj.mode in {'OBJECT'}:
@@ -372,8 +372,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Edit Metaball #
if obj and obj.type == 'META' and obj.mode in {'EDIT'}:
@@ -401,8 +401,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
UseSeparator(self, context)
- layout.operator("view3d.toolshelf", icon='MENU_PANEL')
- layout.operator("view3d.properties", icon='MENU_PANEL')
+ layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+ layout.prop(view, "show_region_ui", icon='MENU_PANEL')
# Text Object Mode #
if obj and obj.type == 'FONT' and obj.mode in {'OBJECT'}:
@@ -436,8 +436,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
# New Entry For Switching to Editmode
layout.operator("view3d.interactive_mode_text", icon='VIEW3D')
UseSepa
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list