[Bf-extensions-cvs] [78031466] master: space_view3d_spacebar_menu: grease pencil menus, various changes

meta-androcto noreply at git.blender.org
Mon May 20 08:57:23 CEST 2019


Commit: 780314669fc412a2123c6edebbd1027ee5419e36
Author: meta-androcto
Date:   Mon May 20 16:57:09 2019 +1000
Branches: master
https://developer.blender.org/rBA780314669fc412a2123c6edebbd1027ee5419e36

space_view3d_spacebar_menu: grease pencil menus, various changes

===================================================================

M	space_view3d_spacebar_menu.py

===================================================================

diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 7b547312..b898d027 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -20,7 +20,7 @@
 bl_info = {
     "name": "Dynamic Context Menu",
     "author": "meta-androcto",
-    "version": (1, 9, 2),
+    "version": (1, 9, 3),
     "blender": (2, 80, 0),
     "location": "View3D > Spacebar",
     "description": "Object Mode Context Sensitive Spacebar Menu",
@@ -79,8 +79,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             UseSeparator(self, context)
             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')
+
         else:
 # Mesh Object Mode #
 
@@ -91,6 +90,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("VIEW3D_MT_Animation_Player",
                             text="Animation", icon='PLAY')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
                 UseSeparator(self, context)
@@ -105,8 +105,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-                if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
-                    layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL')
+#                if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
+#                    layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL')
                 layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
                 layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
                 layout.operator_menu_enum("object.constraint_add",
@@ -115,7 +115,6 @@ 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_InteractiveMode", icon='EDITMODE_HLT')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -127,6 +126,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("VIEW3D_MT_Animation_Player",
                             text="Animation", icon='PLAY')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Edit_Mesh", icon='RESTRICT_SELECT_OFF')
                 layout.menu("VIEW3D_MT_Edit_Multi", icon='VERTEXSEL')
@@ -149,7 +149,6 @@ 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_InteractiveMode", icon='EDITMODE_HLT')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -159,6 +158,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
 
                 layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_Sculpts", icon='SCULPTMODE_HLT')
@@ -169,7 +169,6 @@ 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_InteractiveMode", icon='EDITMODE_HLT')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -179,6 +178,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
 
                 layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 UseSeparator(self, context)
     #            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
@@ -187,7 +187,6 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("VIEW3D_MT_Vertex_Colors", icon='GROUP_VCOL')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -197,6 +196,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
 
                 layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_Paint_Weights", icon='WPAINT_HLT')
@@ -205,7 +205,6 @@ 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_InteractiveMode", icon='EDITMODE_HLT')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -215,13 +214,13 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
 
                 layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
     #            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
                 layout.menu("VIEW3D_MT_Brush_Selection",
                             text="Texture Paint Tool", icon='SCULPTMODE_HLT')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -234,6 +233,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("VIEW3D_MT_Animation_Player",
                             text="Animation", icon='PLAY')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
                 UseSeparator(self, context)
@@ -257,7 +257,6 @@ 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_Other", icon='OBJECT_DATA')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -269,6 +268,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("VIEW3D_MT_Animation_Player",
                             text="Animation", icon='PLAY')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Edit_Curve",
                             icon='RESTRICT_SELECT_OFF')
@@ -289,7 +289,6 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                                 icon='X')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
                 UseSeparator(self, context)
                 layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
                 layout.prop(view, "show_region_ui", icon='MENU_PANEL')
@@ -302,6 +301,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("VIEW3D_MT_Animation_Player",
                             text="Animation", icon='PLAY')
                 UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
                 layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list