[Bf-blender-cvs] [b642d36bc6e] greasepencil-object: Merge branch 'master' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Thu Jan 23 09:18:32 CET 2020


Commit: b642d36bc6eab4c851efeb1487f24c01eebac9e5
Author: Antonio Vazquez
Date:   Thu Jan 23 09:18:26 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb642d36bc6eab4c851efeb1487f24c01eebac9e5

Merge branch 'master' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index cb4a0077e08,c03d681f2b2..10a07ef94f3
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -2193,19 -2194,66 +2238,77 @@@ class VIEW3D_PT_tools_active(ToolSelect
              None,
              *_tools_annotate,
          ],
 +        'VERTEX_GPENCIL': [
 +            _defs_gpencil_vertex.generate_from_brushes,
 +            None,
 +            *_tools_annotate,
 +            None,
 +            lambda context: (
 +                VIEW3D_PT_tools_active._tools_gpencil_select
 +                if _defs_gpencil_vertex.poll_select_mask(context)
 +                else ()
 +            ),
 +        ],
      }
+ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel):
+     bl_space_type = 'SEQUENCE_EDITOR'
+     bl_region_type = 'TOOLS'
+     bl_label = "Tools"  # not visible
+     bl_options = {'HIDE_HEADER'}
+ 
+     # Satisfy the 'ToolSelectPanelHelper' API.
+     keymap_prefix = "Sequence Editor Tool:"
+ 
+     # Default group to use as a fallback.
+     tool_fallback_id = "builtin.select"
+ 
+     @classmethod
+     def tools_from_context(cls, context, mode=None):
+         if mode is None:
+             if context.space_data:
+                 mode = context.space_data.view_type
+         for tools in (cls._tools[None], cls._tools.get(mode, ())):
+             for item in tools:
+                 if not (type(item) is ToolDef) and callable(item):
+                     yield from item(context)
+                 else:
+                     yield item
+ 
+     @classmethod
+     def tools_all(cls):
+         yield from cls._tools.items()
  
+     _tools_select = (
+         (
+             _defs_sequencer_select.select,
+             _defs_sequencer_select.box,
+         ),
+     )
+     _tools_annotate = (
+         (
+             _defs_annotate.scribble,
+             _defs_annotate.line,
+             _defs_annotate.poly,
+             _defs_annotate.eraser,
+         ),
+     )
+ 
+     _tools = {
+         None: [
+         ],
+         'PREVIEW': [
+             *_tools_annotate,
+         ],
+         'SEQUENCER': [
+             *_tools_select,
+             _defs_sequencer_generic.cut,
+         ],
+         'SEQUENCER_PREVIEW': [
+             *_tools_select,
+             *_tools_annotate,
+             _defs_sequencer_generic.cut,
+         ],
+     }
  
  classes = (
      IMAGE_PT_tools_active,



More information about the Bf-blender-cvs mailing list