[Bf-blender-cvs] [dda3c11b4db] greasepencil-object: UI: Move Insert/Delete frames to animation tab

Antonio Vazquez noreply at git.blender.org
Sun Jul 2 18:47:15 CEST 2017


Commit: dda3c11b4dbfb6a5813a75bc212f1a347f0df274
Author: Antonio Vazquez
Date:   Sun Jul 2 18:46:58 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdda3c11b4dbfb6a5813a75bc212f1a347f0df274

UI: Move Insert/Delete frames to animation tab

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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

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 ae676a62815..14cecd87693 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -103,10 +103,6 @@ class GreasePencilDrawingToolsPanel:
         col.separator()
 
         sub = col.column(align=True)
-        sub.operator("gpencil.blank_frame_add", icon='NEW')
-        sub.operator("gpencil.active_frames_delete_all", icon='X', text="Delete Frame(s)")
-
-        sub = col.column(align=True)
         sub.prop(context.tool_settings, "use_gpencil_additive_drawing", text="Additive Drawing")
         if not is_3d_view:
             sub.prop(context.tool_settings, "use_gpencil_continuous_drawing", text="Continuous Drawing")
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 699b9dbbb62..a87fa6e0f79 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -292,6 +292,12 @@ class VIEW3D_PT_tools_animation(View3DPanel, Panel):
         col.label(text="Action:")
         col.operator("nla.bake", text="Bake Action")
 
+        row = layout.row(align=True)
+        row.label("Grease Pencil:")
+        row = layout.row(align=True)
+        row.operator("gpencil.blank_frame_add", icon='NEW')
+        row.operator("gpencil.active_frames_delete_all", icon='X', text="Delete Frame(s)")
+
 
 class VIEW3D_PT_tools_rigid_body(View3DPanel, Panel):
     bl_category = "Physics"




More information about the Bf-blender-cvs mailing list