[Bf-blender-cvs] [6ef94c6407d] greasepencil-object: UI: Remove more old Toolbar panels
Antonio Vazquez
noreply at git.blender.org
Wed Jul 25 12:48:06 CEST 2018
Commit: 6ef94c6407d97465aa2b6b67c42603305b9b94c1
Author: Antonio Vazquez
Date: Wed Jul 25 12:47:57 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6ef94c6407d97465aa2b6b67c42603305b9b94c1
UI: Remove more old Toolbar panels
The options has been moved to header or menu
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index ad03defcc99..db7e626acc4 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -100,6 +100,11 @@ class VIEW3D_HT_header(Header):
row = layout.row(align=True)
row.prop(tool_settings.gpencil_sculpt, "use_select_mask", text="")
+ row.popover(
+ panel="VIEW3D_PT_tools_grease_pencil_interpolate",
+ text="Interpolate"
+ )
+
VIEW3D_MT_editor_menus.draw_collapsible(context, layout)
layout.separator_spacer()
@@ -278,6 +283,7 @@ class VIEW3D_MT_editor_menus(Menu):
if gp_edit:
layout.menu("VIEW3D_MT_edit_gpencil")
+ layout.menu("VIEW3D_MT_gpencil_animation")
elif edit_object:
layout.menu("VIEW3D_MT_edit_%s" % edit_object.type.lower())
@@ -3506,16 +3512,19 @@ class VIEW3D_MT_edit_gpencil(Menu):
layout = self.layout
layout.menu("VIEW3D_MT_edit_gpencil_transform")
- layout.operator("transform.mirror", text="Mirror")
- layout.menu("GPENCIL_MT_snap")
layout.separator()
- layout.operator("gpencil.brush_paint", text="Sculpt Strokes").wait_for_input = True
- layout.prop_menu_enum(tool_settings.gpencil_sculpt, "tool", text="Sculpt Brush")
+ layout.operator("transform.bend", text="Bend")
+ layout.operator("transform.mirror", text="Mirror")
+ layout.operator("transform.shear", text="Shear")
+ layout.operator("transform.tosphere", text="To Sphere")
+ layout.separator()
+ layout.menu("GPENCIL_MT_snap")
layout.separator()
+
layout.menu("VIEW3D_MT_object_animation") # NOTE: provides keyingset access...
layout.menu("VIEW3D_MT_edit_gpencil_interpolate")
@@ -3523,6 +3532,8 @@ class VIEW3D_MT_edit_gpencil(Menu):
layout.operator("gpencil.duplicate_move", text="Duplicate")
layout.operator("gpencil.stroke_subdivide", text="Subdivide")
+ layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
+ layout.operator("gpencil.stroke_simplify", text="Adaptative")
layout.separator()
@@ -3534,7 +3545,8 @@ class VIEW3D_MT_edit_gpencil(Menu):
layout.separator()
layout.operator("gpencil.copy", text="Copy")
- layout.operator("gpencil.paste", text="Paste")
+ layout.operator("gpencil.paste", text="Paste").type = 'COPY'
+ layout.operator("gpencil.paste", text="Paste & Merge").type = 'MERGE'
layout.separator()
@@ -3555,7 +3567,35 @@ class VIEW3D_MT_edit_gpencil(Menu):
layout.separator()
layout.menu("VIEW3D_MT_edit_gpencil_delete")
+ layout.operator("gpencil.stroke_cyclical_set", text="Toggle Cyclic").type = 'TOGGLE'
+
+ layout.separator()
+
+ layout.operator_menu_enum("gpencil.reproject", text="Reproject Strokes...", property="type")
+ layout.operator_menu_enum("gpencil.frame_clean_fill", text="Clean Boundary Strokes...", property="mode")
+
+class VIEW3D_MT_gpencil_animation(Menu):
+ bl_label = "Animation"
+
+ @classmethod
+ def poll(cls, context):
+ ob = context.active_object
+ return ob and ob.type == 'GPENCIL' and ob.mode != 'OBJECT'
+
+ @staticmethod
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("gpencil.blank_frame_add", icon='NEW')
+ layout.operator("gpencil.active_frames_delete_all", icon='X', text="Delete Frame(s)")
+
+ layout.separator()
+ layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame")
+ layout.operator("gpencil.frame_duplicate", text="Duplicate All Layers").mode = 'ALL'
+
+ layout.separator()
+ layout.prop(context.tool_settings, "use_gpencil_additive_drawing", text="Additive Drawing")
class VIEW3D_MT_edit_gpencil_transform(Menu):
bl_label = "Transform"
@@ -4874,6 +4914,7 @@ classes = (
VIEW3D_MT_edit_mesh_showhide,
VIEW3D_MT_edit_gpencil,
VIEW3D_MT_edit_gpencil_delete,
+ VIEW3D_MT_gpencil_animation,
VIEW3D_MT_edit_curve,
VIEW3D_MT_edit_curve_ctrlpoints,
VIEW3D_MT_edit_curve_segments,
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 049d7794374..366edb9cee1 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1619,9 +1619,8 @@ class VIEW3D_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel):
# Grease Pencil stroke interpolation tools
class VIEW3D_PT_tools_grease_pencil_interpolate(Panel):
bl_space_type = 'VIEW_3D'
- bl_label = "Interpolate Strokes"
- bl_category = "Animation"
- bl_region_type = 'TOOLS'
+ bl_region_type = 'HEADER'
+ bl_label = "Interpolate"
@classmethod
def poll(cls, context):
@@ -1742,13 +1741,6 @@ class VIEW3D_PT_tools_grease_pencil_weight_appearance(GreasePencilAppearancePane
bl_context = ".greasepencil_weight"
bl_label = "Appearance"
-# Grease Pencil Animation Tools
-class VIEW3D_PT_tools_grease_pencil_animation(GreasePencilAnimationPanel, Panel):
- bl_space_type = 'VIEW_3D'
- bl_label = "Animation"
- bl_category = "Animation"
- bl_region_type = 'TOOLS'
-
classes = (
VIEW3D_PT_tools_meshedit_options,
VIEW3D_PT_tools_curveedit_options_stroke,
@@ -1787,7 +1779,6 @@ classes = (
VIEW3D_PT_tools_grease_pencil_brushcurves,
# GPXX: review
# VIEW3D_PT_tools_grease_pencil_shapes,
- VIEW3D_PT_tools_grease_pencil_edit,
VIEW3D_PT_tools_grease_pencil_sculpt,
VIEW3D_PT_tools_grease_pencil_weight_paint,
VIEW3D_PT_tools_grease_pencil_weight_tools,
@@ -1795,8 +1786,6 @@ classes = (
VIEW3D_PT_tools_grease_pencil_sculpt_appearance,
VIEW3D_PT_tools_grease_pencil_weight_appearance,
VIEW3D_PT_tools_grease_pencil_interpolate,
- # GPXX: review
- #VIEW3D_PT_tools_grease_pencil_animation,
)
if __name__ == "__main__": # only for live edit.
More information about the Bf-blender-cvs
mailing list