[Bf-blender-cvs] [fa9a41c] GPencil_EditStrokes: Expose Grease Pencil "Convert to Curves" operator directly in toolbar instead

[Joshua Leung]

Commit: fa9a41cd0219ccfe5e5fa1ccae468c4d1411d28a
Author: Joshua Leung
Date:   Thu Oct 23 19:35:57 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rBfa9a41cd0219ccfe5e5fa1ccae468c4d1411d28a

Expose Grease Pencil "Convert to Curves" operator directly in toolbar instead

It only really applies to the 3D view, so this makes more sense, and fits
the workflows for modellers and mograph artists more.

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.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 5ca2300..00b75e9 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -78,7 +78,8 @@ class GreasePencilDrawingToolsPanel():
             col.separator()
             col.separator()
 
-            col.label(text="Measure:")
+            col.label(text="Tools:")
+            col.operator("gpencil.convert", text="Convert...")
             col.operator("view3d.ruler")
 
 
@@ -203,17 +204,6 @@ class GPENCIL_UL_layer(UIList):
             layout.label(text="", icon_value=icon)
 
 
-class GPENCIL_MT_layer_specials(Menu):
-    bl_label = "Grease Pencil Layer Specials"
-    #COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
-    def draw(self, context):
-        layout = self.layout
-
-        layout.operator("gpencil.convert", text='Convert', icon='OUTLINER_OB_CURVE')  # icon is not ideal
-        layout.operator("gpencil.active_frame_delete", text="Delete Frame", icon='X')  # icon is not ideal
-
-
 class GreasePencilDataPanel():
     # subclass must set
     # bl_space_type = 'IMAGE_EDITOR'
@@ -271,7 +261,6 @@ class GreasePencilDataPanel():
         sub = col.column(align=True)
         sub.operator("gpencil.layer_add", icon='ZOOMIN', text="")
         sub.operator("gpencil.layer_remove", icon='ZOOMOUT', text="")
-        sub.menu("GPENCIL_MT_layer_specials", icon='DOWNARROW_HLT', text="")
 
         gpl = context.active_gpencil_layer
         if gpl: