[Bf-blender-cvs] [81feb43461d] greasepencil-object: UI: Move multiedit to 3Dview bar

[Antonio Vazquez]

Commit: 81feb43461da0625e914ce3bfb0172538f3238a5
Author: Antonio Vazquez
Date:   Tue Aug 29 15:41:59 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB81feb43461da0625e914ce3bfb0172538f3238a5

UI: Move multiedit to 3Dview bar

Remove from panel and add to the bottom 3D View options bar

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

M	release/scripts/startup/bl_ui/properties_data_gpencil.py
M	release/scripts/startup/bl_ui/space_view3d.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 78f55838f39..f46eabdb60a 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -123,9 +123,6 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
         row = layout.row()
         row.prop(gpd, "pixfactor", text="Pixel Factor")
 
-        row = layout.row()
-        row.prop(gpd, "multiedit", text="MultEdit Strokes")
-
 classes = (
     DATA_PT_gpencil,
     DATA_PT_gpencil_datapanel,
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 4e12be1cce1..28895e53530 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -164,6 +164,11 @@ class VIEW3D_HT_header(Header):
                 row.prop(context.tool_settings.gpencil_sculpt, "use_select_mask")
                 row.prop(context.tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
 
+            if context.gpencil_data.use_stroke_edit_mode:
+                gpd = context.gpencil_data
+                row = layout.row()
+                row.prop(gpd, "multiedit", text="Multi Edit", icon="FORCE_HARMONIC")
+
 
 class VIEW3D_MT_editor_menus(Menu):
     bl_space_type = 'VIEW3D_MT_editor_menus'