[Bf-extensions-cvs] [fb55d80b] master: spacebar_menu: view, animation, main menu changes: T68591

meta-androcto noreply at git.blender.org
Sun Aug 25 05:26:22 CEST 2019


Commit: fb55d80bfbf656d794ac02103065eaa9a2377d4c
Author: meta-androcto
Date:   Sun Aug 25 13:26:07 2019 +1000
Branches: master
https://developer.blender.org/rBAfb55d80bfbf656d794ac02103065eaa9a2377d4c

spacebar_menu: view, animation, main menu changes: T68591

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

M	space_view3d_spacebar_menu/__init__.py
A	space_view3d_spacebar_menu/animation_menus.py
M	space_view3d_spacebar_menu/object_menus.py
M	space_view3d_spacebar_menu/view_menus.py

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

diff --git a/space_view3d_spacebar_menu/__init__.py b/space_view3d_spacebar_menu/__init__.py
index 845740c9..2cf797ef 100644
--- a/space_view3d_spacebar_menu/__init__.py
+++ b/space_view3d_spacebar_menu/__init__.py
@@ -41,6 +41,7 @@ if "bpy" in locals():
     importlib.reload(curve_menus)
     importlib.reload(snap_origin_cursor)
     importlib.reload(sculpt_brush_paint)
+    importlib.reload(animation_menus)
 
 else:
     from . import object_menus
@@ -52,6 +53,7 @@ else:
     from . import curve_menus
     from . import snap_origin_cursor
     from . import sculpt_brush_paint
+    from . import animation_menus
 
 import bpy
 from bpy.types import (
@@ -91,8 +93,8 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
             UseSeparator(self, context)
             layout.menu("INFO_MT_area", icon='WORKSPACE')
-            layout.menu("VIEW3D_MT_View_Directions", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_View_Navigation", icon='PIVOT_BOUNDBOX')
+            layout.menu("VIEW3D_MT_view_viewpoint", icon='ZOOM_ALL')
+            layout.menu("VIEW3D_MT_view_navigation", icon='PIVOT_BOUNDBOX')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
             UseSeparator(self, context)
@@ -118,7 +120,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
@@ -142,9 +144,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')
-                UseSeparator(self, context)
-                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'}:
@@ -156,7 +155,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Edit_Mesh", icon='RESTRICT_SELECT_OFF')
                 layout.menu("VIEW3D_MT_Edit_Multi", icon='VERTEXSEL')
                 UseSeparator(self, context)
@@ -178,9 +177,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')
-                UseSeparator(self, context)
-                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'}:
@@ -192,7 +188,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_Sculpts", icon='SCULPTMODE_HLT')
                 layout.menu("VIEW3D_MT_Angle_Control", text="Angle Control", icon='BRUSH_SCULPT_DRAW')
@@ -202,9 +198,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')
-                UseSeparator(self, context)
-                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'}:
@@ -216,7 +209,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL')
                 UseSeparator(self, context)
     #            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
                 layout.menu("VIEW3D_MT_Brush_Selection",
@@ -224,9 +217,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')
-                UseSeparator(self, context)
-                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'}:
@@ -238,7 +228,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_view", icon='ZOOM_ALL')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_Paint_Weights", icon='WPAINT_HLT')
     #            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
@@ -246,9 +236,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')
-                UseSeparator(self, context)
-                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'}:
@@ -260,15 +247,12 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_view", 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')
-                UseSeparator(self, context)
-                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'}:
@@ -281,7 +265,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 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_view", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
@@ -304,9 +288,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')
-                UseSeparator(self, context)
-                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'}:
@@ -318,7 +299,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                 layout.menu("SCREEN_MT_user_menu", text="Quick Favorites", icon='HEART')
                 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_view", icon='ZOOM_ALL')
                 layout.menu("VIEW3D_MT_Select_Edit_Curve",
                             icon='RESTRICT_SELECT_OFF')
                 UseSeparator(self, context)
@@ -338,9 +319,6 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                                 icon='X')
                 UseSeparator(self, context)
                 layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-                UseSeparator(self, context)
-                layout.prop(view, "show_regio

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list