diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 17 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 16 |
4 files changed, 8 insertions, 33 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index a8a29f03b73..084ba4b36d8 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1204,7 +1204,7 @@ class CLIP_PT_tools_scenesetup(Panel): # Grease Pencil properties -class CLIP_PT_grease_pencil(AnnotationDataPanel, CLIP_PT_clip_view_panel, Panel): +class CLIP_PT_annotation(AnnotationDataPanel, CLIP_PT_clip_view_panel, Panel): bl_space_type = 'CLIP_EDITOR' bl_region_type = 'UI' bl_category = "Annotation" @@ -1762,7 +1762,7 @@ classes = ( CLIP_PT_tools_mask_transforms, CLIP_PT_tools_mask_tools, CLIP_PT_tools_scenesetup, - CLIP_PT_grease_pencil, + CLIP_PT_annotation, CLIP_PT_tools_grease_pencil_draw, CLIP_MT_view, CLIP_MT_clip, diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 8f6e9d71790..bd003063e16 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -1684,7 +1684,7 @@ class IMAGE_PT_uv_cursor(Panel): # Grease Pencil properties -class IMAGE_PT_grease_pencil(AnnotationDataPanel, Panel): +class IMAGE_PT_annotation(AnnotationDataPanel, Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' bl_category = "View" @@ -1750,7 +1750,7 @@ classes = ( IMAGE_PT_sample_line, IMAGE_PT_scope_sample, IMAGE_PT_uv_cursor, - IMAGE_PT_grease_pencil, + IMAGE_PT_annotation, ) diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 88b35fa4035..939102bc11b 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -25,7 +25,6 @@ from bpy.app.translations import contexts as i18n_contexts from bl_ui.utils import PresetPanel from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, - GreasePencilToolsPanel, ) from bl_ui.space_toolsystem_common import ( ToolActivePanelHelper, @@ -656,7 +655,7 @@ class NODE_UL_interface_sockets(bpy.types.UIList): # Grease Pencil properties -class NODE_PT_grease_pencil(AnnotationDataPanel, Panel): +class NODE_PT_annotation(AnnotationDataPanel, Panel): bl_space_type = 'NODE_EDITOR' bl_region_type = 'UI' bl_category = "View" @@ -670,17 +669,6 @@ class NODE_PT_grease_pencil(AnnotationDataPanel, Panel): return snode is not None and snode.node_tree is not None -class NODE_PT_grease_pencil_tools(GreasePencilToolsPanel, Panel): - bl_space_type = 'NODE_EDITOR' - bl_region_type = 'UI' - bl_category = "View" - bl_options = {'DEFAULT_CLOSED'} - - # NOTE: this is just a wrapper around the generic GP tools panel - # It contains access to some essential tools usually found only in - # toolbar, but which may not necessarily be open - - def node_draw_tree_view(_layout, _context): pass @@ -717,8 +705,7 @@ classes = ( NODE_PT_active_tool, NODE_PT_backdrop, NODE_PT_quality, - NODE_PT_grease_pencil, - NODE_PT_grease_pencil_tools, + NODE_PT_annotation, NODE_UL_interface_sockets, node_panel(EEVEE_MATERIAL_PT_settings), diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index ff4657f2e7f..ff71c7a825a 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -29,7 +29,6 @@ from bpy.app.translations import ( ) from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, - GreasePencilToolsPanel, ) from rna_prop_ui import PropertyPanel @@ -1992,7 +1991,7 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): col.prop(mod, "gamma") -class SEQUENCER_PT_grease_pencil(AnnotationDataPanel, SequencerButtonsPanel_Output, Panel): +class SEQUENCER_PT_annotation(AnnotationDataPanel, SequencerButtonsPanel_Output, Panel): bl_space_type = 'SEQUENCE_EDITOR' bl_region_type = 'UI' bl_category = "View" @@ -2001,16 +2000,6 @@ class SEQUENCER_PT_grease_pencil(AnnotationDataPanel, SequencerButtonsPanel_Outp # But, it should only show up when there are images in the preview region -class SEQUENCER_PT_grease_pencil_tools(GreasePencilToolsPanel, SequencerButtonsPanel_Output, Panel): - bl_space_type = 'SEQUENCE_EDITOR' - bl_region_type = 'UI' - bl_category = "View" - - # NOTE: this is just a wrapper around the generic GP tools panel - # It contains access to some essential tools usually found only in - # toolbar, which doesn't exist here... - - class SEQUENCER_PT_custom_props(SequencerButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} _context_path = "scene.sequence_editor.active_strip" @@ -2078,8 +2067,7 @@ classes = ( SEQUENCER_PT_view_safe_areas, SEQUENCER_PT_view_safe_areas_center_cut, - SEQUENCER_PT_grease_pencil, - SEQUENCER_PT_grease_pencil_tools, + SEQUENCER_PT_annotation, ) if __name__ == "__main__": # only for live edit. |