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

[Antonio Vazquez]

Commit: 47dcf365f742786a74cb3b7cd5f56eab143a8556
Author: Antonio Vazquez
Date:   Sun Sep 3 11:03:20 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB47dcf365f742786a74cb3b7cd5f56eab143a8556

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index b0aa8f40cf1,2aa978a51d8..11dfdb5a4e4
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@@ -354,48 -338,17 +354,48 @@@ class GreasePencilBrushPanel
          # Brush details
          if brush is not None:
              row = layout.row()
 -            row.prop(brush, "line_width")
 +            row.prop(brush, "name", text='')
              row = layout.row(align=True)
-             row.prop(brush, "use_random_pressure", text='', icon='RNDCURVE')
-             row.prop(brush, "line_width", text='Radius')
-             row.prop(brush, "use_pressure", text='', icon='STYLUS_PRESSURE')
+             row.prop(brush, "use_random_pressure", text="", icon='RNDCURVE')
 -            row.prop(brush, "pen_sensitivity_factor", slider=True)
++            row.prop(brush, "line_width", text="Radius")
+             row.prop(brush, "use_pressure", text="", icon='STYLUS_PRESSURE')
              row = layout.row(align=True)
-             row.prop(brush, "use_random_strength", text='', icon='RNDCURVE')
+             row.prop(brush, "use_random_strength", text="", icon='RNDCURVE')
              row.prop(brush, "strength", slider=True)
-             row.prop(brush, "use_strength_pressure", text='', icon='STYLUS_PRESSURE')
+             row.prop(brush, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
 -            row = layout.row(align=True)
 -            row.prop(brush, "random_press", slider=True)
 +
 +            row = layout.row(align=False)
 +            row.prop(context.tool_settings, "use_gpencil_draw_onback", text="Draw on Back")
 +
 +
 +class GreasePencilBrushOptionsPanel:
 +    # subclass must set
 +    # bl_space_type = 'IMAGE_EDITOR'
 +    bl_label = "Strokes"
 +    bl_category = "Tools"
 +    bl_region_type = 'TOOLS'
 +    bl_options = {'DEFAULT_CLOSED'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        is_3d_view = context.space_data.type == 'VIEW_3D'
 +        if is_3d_view:
 +            if context.gpencil_data is None:
 +                return False
 +
 +            gpd = context.gpencil_data
 +            return bool(gpd.is_stroke_paint_mode)
 +        else:
 +            return True
 +
 +    @staticmethod
 +    def draw(self, context):
 +        layout = self.layout
 +        brush = context.active_gpencil_brush
 +        if brush is not None:
 +            col = layout.column(align=True)
 +            col.label(text="Settings:")
 +            col.prop(brush, "random_press", slider=True)
  
              row = layout.row(align=True)
              row.prop(brush, "jitter", slider=True)
@@@ -979,18 -839,10 +979,18 @@@ class GPENCIL_MT_brush_specials(Menu)
  
      def draw(self, context):
          layout = self.layout
-         layout.operator("gpencil.brush_copy", icon='PASTEDOWN', text="Copy current drawing brush")
-         layout.operator("gpencil.brush_presets_create", icon='HELP', text="Create a set of predefined brushes")
+         layout.operator("gpencil.brush_copy", icon='PASTEDOWN', text="Copy Current Drawing Brush")
+         layout.operator("gpencil.brush_presets_create", icon='HELP', text="Create a Set of Predefined Brushes")
  
  
 +class GPENCIL_MT_palettecolor_copy(Menu):
 +    bl_label = "Layer"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        layout.operator_enum("palette.palettecolor_copy", "type")
 +
  class GPENCIL_MT_palettecolor_specials(Menu):
      bl_label = "Layer"