diff options
7 files changed, 20 insertions, 21 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py index be35d2ba86c..a63a8e10c08 100644 --- a/release/scripts/startup/bl_ui/properties_data_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py @@ -21,7 +21,6 @@ import bpy from bpy.types import Menu, Panel, UIList from rna_prop_ui import PropertyPanel from .properties_grease_pencil_common import ( - GreasePencilDataPanel, GreasePencilOnionPanel, ) diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 7101b855c58..8aa57476ddc 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -76,11 +76,11 @@ def gpencil_active_brush_settings_simple(context, layout): # XXX: To be replaced with active tools -class GreasePencilDrawingToolsPanel: +class AnnotationDrawingToolsPanel: # subclass must set # bl_space_type = 'IMAGE_EDITOR' - bl_label = "Grease Pencil" - bl_category = "Grease Pencil" + bl_label = "Annotation" + bl_category = "Annotation" bl_region_type = 'TOOLS' @classmethod @@ -649,7 +649,7 @@ class GPENCIL_UL_annotation_layer(UIList): layout.label(text="", icon_value=icon) -class GreasePencilDataPanel: +class AnnotationDataPanel: bl_label = "Annotations" bl_region_type = 'UI' bl_options = {'DEFAULT_CLOSED'} diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 1564204c613..c40013b2610 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -23,8 +23,8 @@ from bpy.types import Panel, Header, Menu, UIList from bpy.app.translations import pgettext_iface as iface_ from bl_operators.presets import PresetMenu from .properties_grease_pencil_common import ( - GreasePencilDrawingToolsPanel, - GreasePencilDataPanel, + AnnotationDrawingToolsPanel, + AnnotationDataPanel, ) @@ -1140,7 +1140,7 @@ class CLIP_PT_tools_scenesetup(Panel): # Grease Pencil properties -class CLIP_PT_grease_pencil(GreasePencilDataPanel, CLIP_PT_clip_view_panel, Panel): +class CLIP_PT_grease_pencil(AnnotationDataPanel, CLIP_PT_clip_view_panel, Panel): bl_space_type = 'CLIP_EDITOR' bl_region_type = 'UI' bl_options = {'DEFAULT_CLOSED'} @@ -1150,7 +1150,7 @@ class CLIP_PT_grease_pencil(GreasePencilDataPanel, CLIP_PT_clip_view_panel, Pane # Grease Pencil drawing tools -class CLIP_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel): +class CLIP_PT_tools_grease_pencil_draw(AnnotationDrawingToolsPanel, Panel): bl_space_type = 'CLIP_EDITOR' bl_region_type = 'TOOLS' diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 06615ebb2c3..24673af319e 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -33,8 +33,8 @@ from .properties_paint_common import ( brush_mask_texture_settings, ) from .properties_grease_pencil_common import ( - GreasePencilDrawingToolsPanel, - GreasePencilDataPanel, + AnnotationDrawingToolsPanel, + AnnotationDataPanel, ) from bpy.app.translations import pgettext_iface as iface_ @@ -1436,7 +1436,7 @@ class IMAGE_PT_scope_sample(ImageScopesPanel, Panel): # Grease Pencil properties -class IMAGE_PT_grease_pencil(GreasePencilDataPanel, Panel): +class IMAGE_PT_grease_pencil(AnnotationDataPanel, Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' @@ -1445,7 +1445,7 @@ class IMAGE_PT_grease_pencil(GreasePencilDataPanel, Panel): # Grease Pencil drawing tools. -class IMAGE_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel): +class IMAGE_PT_tools_grease_pencil_draw(AnnotationDrawingToolsPanel, Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'TOOLS' diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 43a124cd48f..9ead34406c2 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -23,8 +23,8 @@ from bpy.types import Header, Menu, Panel from bpy.app.translations import pgettext_iface as iface_ from bl_operators.presets import PresetMenu from .properties_grease_pencil_common import ( - GreasePencilDrawingToolsPanel, - GreasePencilDataPanel, + AnnotationDrawingToolsPanel, + AnnotationDataPanel, GreasePencilToolsPanel, ) @@ -521,7 +521,7 @@ class NODE_UL_interface_sockets(bpy.types.UIList): # Grease Pencil properties -class NODE_PT_grease_pencil(GreasePencilDataPanel, Panel): +class NODE_PT_grease_pencil(AnnotationDataPanel, Panel): bl_space_type = 'NODE_EDITOR' bl_region_type = 'UI' bl_options = {'DEFAULT_CLOSED'} @@ -548,7 +548,7 @@ class NODE_PT_grease_pencil_tools(GreasePencilToolsPanel, Panel): # Grease Pencil drawing tools -class NODE_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel): +class NODE_PT_tools_grease_pencil_draw(AnnotationDrawingToolsPanel, Panel): bl_space_type = 'NODE_EDITOR' bl_region_type = 'TOOLS' diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index dd90968bca3..5dfe54d695f 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Header, Menu, Panel from rna_prop_ui import PropertyPanel from .properties_grease_pencil_common import ( - GreasePencilDataPanel, + AnnotationDataPanel, GreasePencilToolsPanel, ) from bpy.app.translations import pgettext_iface as iface_ @@ -1272,7 +1272,7 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): col.prop(mod, "gamma") -class SEQUENCER_PT_grease_pencil(GreasePencilDataPanel, SequencerButtonsPanel_Output, Panel): +class SEQUENCER_PT_grease_pencil(AnnotationDataPanel, SequencerButtonsPanel_Output, Panel): bl_space_type = 'SEQUENCE_EDITOR' bl_region_type = 'UI' diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 1399b7c5fa6..e9738458353 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -20,7 +20,7 @@ import bpy from bpy.types import Header, Menu, Panel from .properties_paint_common import UnifiedPaintPanel -from .properties_grease_pencil_common import GreasePencilDataPanel +from .properties_grease_pencil_common import AnnotationDataPanel from bpy.app.translations import contexts as i18n_contexts @@ -4823,7 +4823,7 @@ class VIEW3D_PT_quad_view(Panel): # Annotation properties -class VIEW3D_PT_grease_pencil(GreasePencilDataPanel, Panel): +class VIEW3D_PT_grease_pencil(AnnotationDataPanel, Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' |