From 03ca79a5094b471e8a25d554360565704ec29b8f Mon Sep 17 00:00:00 2001 From: Antonioya Date: Fri, 9 Nov 2018 19:48:00 +0100 Subject: GP: Remove duplicate shapes popover Now the tools are in Toolbar --- release/scripts/startup/bl_ui/space_view3d.py | 5 ----- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 25 ---------------------- 2 files changed, 30 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0185fc721ad..b46747c3a39 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -73,11 +73,6 @@ class VIEW3D_HT_header(Header): sub.separator(factor=0.4) sub.prop(tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE') - row.popover( - panel="VIEW3D_PT_tools_grease_pencil_shapes", - text="Shapes" - ) - if gpd.use_stroke_edit_mode: row = layout.row(align=True) row.prop(tool_settings, "gpencil_selectmode", text="", expand=True) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 9ac1023185a..2fb056cdfb7 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1745,30 +1745,6 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_jitter(View3DPanel, Panel): layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True) -# Grease Pencil create shapes -class VIEW3D_PT_tools_grease_pencil_shapes(View3DPanel, Panel): - bl_space_type = 'VIEW_3D' - bl_region_type = 'HEADER' - bl_label = "Shapes" - - @classmethod - def poll(cls, context): - ob = context.active_object - return ob and ob.type == 'GPENCIL' - - @staticmethod - def draw(self, context): - layout = self.layout - layout.use_property_split = True - - col = layout.column(align=True) - col.operator("gpencil.primitive", text="Line", icon='IPO_CONSTANT').type = 'LINE' - col.operator("gpencil.primitive", text="Rectangle", icon='UV_FACESEL').type = 'BOX' - col.operator("gpencil.primitive", text="Circle", icon='ANTIALIASED').type = 'CIRCLE' - - layout.operator("object.gpencil_add", text="Monkey", icon='MONKEY').type = 'MONKEY' - - # Grease Pencil stroke editing tools class VIEW3D_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel): bl_space_type = 'VIEW_3D' @@ -1931,7 +1907,6 @@ classes = ( VIEW3D_PT_tools_grease_pencil_brushcurves_sensitivity, VIEW3D_PT_tools_grease_pencil_brushcurves_strength, VIEW3D_PT_tools_grease_pencil_brushcurves_jitter, - VIEW3D_PT_tools_grease_pencil_shapes, VIEW3D_PT_tools_grease_pencil_sculpt, VIEW3D_PT_tools_grease_pencil_weight_paint, VIEW3D_PT_tools_grease_pencil_paint_appearance, -- cgit v1.2.3