[Bf-blender-cvs] [478cb94161f] greasepencil-object: Fix merge error

[Antonio Vazquez]

Commit: 478cb94161fd76cb02042c993a412b2cff8b605e
Author: Antonio Vazquez
Date:   Mon May 14 16:15:02 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB478cb94161fd76cb02042c993a412b2cff8b605e

Fix merge error

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 31d9fae9b24..df3463d4a81 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -138,14 +138,13 @@ class VIEW3D_HT_header(Header):
                 col = row.column()
                 col.enabled = gpd.use_multiedit
                 col.prop(gpd, "show_multiedit_line_only", text="", icon="GHOST")
-        
-		VIEW3D_MT_editor_menus.draw_collapsible(context, layout)
-
 
             if gpd.is_stroke_paint_mode:
                 row = layout.row(align=True)
                 row.operator("gpencil.colorpick", text="Colors", icon="GROUP_VCOL")
 
+        VIEW3D_MT_editor_menus.draw_collapsible(context, layout)
+
 class VIEW3D_MT_editor_menus(Menu):
     bl_space_type = 'VIEW3D_MT_editor_menus'
     bl_label = ""