[Bf-blender-cvs] [bdf4967db76] greasepencil-object: UI: First changes in Edit Toolbar

[Antonio Vazquez]

Commit: bdf4967db762a8c82728f2af5855b09293edccc6
Author: Antonio Vazquez
Date:   Wed Jul 25 11:53:58 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBbdf4967db762a8c82728f2af5855b09293edccc6

UI: First changes in Edit Toolbar

- Add transform tools
- Move Bend, Mirror, Shear and ToSphere as Tools

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_toolsystem_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 f972c467182..1bc8426b61a 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -201,12 +201,6 @@ class GreasePencilStrokeEditPanel:
 
             layout.separator()
 
-        col = layout.column(align=True)
-        col.operator("transform.bend", text="Bend")
-        col.operator("transform.mirror", text="Mirror")
-        col.operator("transform.shear", text="Shear")
-        col.operator("transform.tosphere", text="To Sphere")
-
         layout.separator()
         col = layout.column(align=True)
         col.operator_menu_enum("gpencil.stroke_arrange", text="Arrange Strokes...", property="direction")
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 17caf693fd7..c6015a855cd 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1102,6 +1102,61 @@ class _defs_gpencil_paint:
             )
         )
 
+
+class _defs_gpencil_edit:
+    @ToolDef.from_fn
+    def bend():
+        return dict(
+            text="Bend",
+            icon="ops.transform.bend",
+            widget=None,
+            keymap=(
+                ("transform.bend",
+                 dict(),
+                 dict(type='EVT_TWEAK_A', value='ANY')),
+            ),
+        )
+
+    @ToolDef.from_fn
+    def mirror():
+        return dict(
+            text="Mirror",
+            icon="ops.transform.mirror",
+            widget=None,
+            keymap=(
+                ("transform.mirror",
+                 dict(),
+                 dict(type='EVT_TWEAK_A', value='ANY')),
+            ),
+        )
+
+    @ToolDef.from_fn
+    def shear():
+        return dict(
+            text="Shear",
+            icon="ops.transform.shear",
+            widget=None,
+            keymap=(
+                ("transform.shear",
+                 dict(),
+                 dict(type='EVT_TWEAK_A', value='ANY')),
+            ),
+        )
+
+    @ToolDef.from_fn
+    def tosphere():
+        return dict(
+            text="To Sphere",
+            icon="ops.transform.tospehere",
+            widget=None,
+            keymap=(
+                ("transform.tosphere",
+                 dict(),
+                 dict(type='EVT_TWEAK_A', value='ANY')),
+            ),
+        )
+
+
 class _defs_gpencil_sculpt:
     @classmethod
     def draw_settings_common(cls, context, layout, tool):
@@ -1538,6 +1593,16 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
         'GPENCIL_PAINT': [
             _defs_gpencil_paint.generate_from_brushes,
         ],
+        'GPENCIL_EDIT': [
+            *_tools_select,
+            None,
+            *_tools_transform,
+            None,
+            _defs_gpencil_edit.bend,
+            _defs_gpencil_edit.mirror,
+            _defs_gpencil_edit.shear,
+            _defs_gpencil_edit.tosphere,
+        ],
         'GPENCIL_SCULPT': [
             _defs_gpencil_sculpt.smooth,
             _defs_gpencil_sculpt.thickness,