[Bf-blender-cvs] [e121fb7bfe0] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

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

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/space_view3d.py

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 05165b49327,b7ab57d0f46..31d9fae9b24
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -76,58 -94,21 +90,61 @@@ class VIEW3D_HT_header(Header)
              row.operator("pose.paste", text="", icon='PASTEDOWN').flipped = False
              row.operator("pose.paste", text="", icon='PASTEFLIPDOWN').flipped = True
  
 -        # GPencil
 -        if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
 +        # Grease Pencil
 +        if context.active_object and context.gpencil_data and context.active_object.type == 'GPENCIL':
 +            ob = context.active_object
 +            gpd = context.gpencil_data
 +
 +            if gpd.is_stroke_paint_mode:
 +                row.separator()
 +                row.prop(toolsettings, "gpencil_stroke_placement_view3d", text='')
 +                if toolsettings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'):
 +                    row.separator()
 +                    row.prop(toolsettings.gpencil_sculpt, "lockaxis", text='')
 +
 +                if toolsettings.gpencil_stroke_placement_view3d in ('SURFACE', 'STROKE'):
 +                    row.prop(toolsettings, "use_gpencil_stroke_endpoints")
 +
 +            if gpd.is_stroke_sculpt_mode:
 +                settings = context.tool_settings.gpencil_sculpt
 +                if settings.tool in ('GRAB', 'PUSH', 'TWIST', 'PINCH', 'RANDOMIZE'):
 +                    row.separator()
 +                    row.prop(toolsettings.gpencil_sculpt, "lockaxis", text='')
 +
 +            if gpd.use_stroke_edit_mode:
 +                row = layout.row(align=True)
 +                row.operator("gpencil.copy", text="", icon='COPYDOWN')
 +                row.operator("gpencil.paste", text="", icon='PASTEDOWN')
 +
 +            view = context.space_data
              row = layout.row(align=True)
 -            row.operator("gpencil.copy", text="", icon='COPYDOWN')
 -            row.operator("gpencil.paste", text="", icon='PASTEDOWN')
 -
 -            # XXX: icon
 -            layout.prop(context.gpencil_data, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH')
 -
 -            row = layout.row(align=True)
 -            row.prop(context.tool_settings.gpencil_sculpt, "use_select_mask")
 -            row.prop(context.tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
 -
 -        VIEW3D_MT_editor_menus.draw_collapsible(context, layout)
 -
 +            row.prop(view, "use_gpencil_paper", text="", icon='GHOST')
 +
 +            layout.prop(gpd, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH')
 +
 +            if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode:
 +                row = layout.row(align=True)
 +                row.prop(context.tool_settings.gpencil_sculpt, "use_select_mask")
 +                row.prop(context.tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
 +
 +            if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
 +                settings = context.tool_settings.gpencil_sculpt
 +                row = layout.row(align=True)
 +                row.prop(gpd, "show_edit_lines", text="", icon="PARTICLE_POINT")
 +                row.prop(gpd, "use_multiedit", text="Multi Frame", icon="FORCE_HARMONIC")
 +                col = row.column()
 +                col.enabled = gpd.use_multiedit and (gpd.is_stroke_sculpt_mode or gpd.use_stroke_edit_mode)
 +                col.prop(settings, "use_multiframe_falloff", text="", icon="SMOOTHCURVE")
 +                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")
  
  class VIEW3D_MT_editor_menus(Menu):
      bl_space_type = 'VIEW3D_MT_editor_menus'