[Bf-blender-cvs] [6d914af8307] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 6d914af8307ed582b5941d33c95d2cb7af5f0ade
Author: Antonio Vazquez
Date:   Sat Oct 3 11:00:40 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6d914af8307ed582b5941d33c95d2cb7af5f0ade

Merge branch 'master' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 871d2630f94,e9118a8be91..4c69631f883
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -1655,11 -1652,8 +1652,11 @@@ class VIEW3D_PT_tools_grease_pencil_bru
          row.prop(gp_settings, "use_jitter_pressure", text="", icon='STYLUS_PRESSURE')
          if gp_settings.use_jitter_pressure and self.is_popover is False:
              col.template_curve_mapping(gp_settings, "curve_jitter", brush=True,
-                                 use_negative_slope=True)
+                                        use_negative_slope=True)
  
 +        row = col.row(align=True)
 +        row.prop(gp_settings, "pen_spread")
 +
  
  class VIEW3D_PT_tools_grease_pencil_brush_paint_falloff(GreasePencilBrushFalloff, Panel, View3DPaintPanel):
      bl_context = ".greasepencil_paint"