[Bf-blender-cvs] [835ed6e3b66] temp-gpencil-bezier-stroke-type: Merge branch 'master' into temp-gpencil-bezier-stroke-type

[Falk David]

Commit: 835ed6e3b66dd9f62b44bda30fa43b67154441bf
Author: Falk David
Date:   Thu Jun 10 16:37:51 2021 +0200
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rB835ed6e3b66dd9f62b44bda30fa43b67154441bf

Merge branch 'master' into temp-gpencil-bezier-stroke-type

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 3f5292b30c4,5f47aa90026..e65766b4755
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -5032,8 -5034,11 +5032,12 @@@ class VIEW3D_MT_edit_gpencil_stroke(Men
          layout.operator_menu_enum("gpencil.stroke_caps_set", text="Toggle Caps", property="type")
          layout.operator("gpencil.stroke_flip", text="Switch Direction")
          layout.prop(settings, "use_scale_thickness", text="Scale Thickness")
 +        layout.menu("GPENCIL_MT_stroke_type")
  
+         layout.separator()
+         layout.operator("gpencil.stroke_normalize", text="Normalize Thickness").mode = 'THICKNESS'
+         layout.operator("gpencil.stroke_normalize", text="Normalize Opacity").mode = 'OPACITY'
+ 
          layout.separator()
          layout.operator("gpencil.reset_transform_fill", text="Reset Fill Transform")
  
diff --cc source/blender/blenkernel/intern/brush.c
index af392e27fa0,fdf9cf21b85..a5864e82a24
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@@ -1420,22 -1399,12 +1420,20 @@@ void BKE_brush_gpencil_paint_presets(Ma
      BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_TINT);
    }
  
 +#if 0
 +  /* Curve pen. */
 +  brush = gpencil_brush_ensure(bmain, ts, "Curve pen", OB_MODE_PAINT_GPENCIL, &r_new);
 +  if ((reset) || (r_new)) {
 +    BKE_gpencil_brush_preset_set(bmain, brush, GPAINT_TOOL_CURVE);
 +  }
 +#endif
 +
    /* Set default Draw brush. */
-   if (reset || brush_prev == NULL) {
-     BKE_paint_brush_set(paint, deft_draw);
+   if ((reset == false) && (brush_prev != NULL)) {
+     BKE_paint_brush_set(paint, brush_prev);
    }
    else {
-     if (brush_prev != NULL) {
-       BKE_paint_brush_set(paint, brush_prev);
-     }
+     BKE_paint_brush_set(paint, deft_draw);
    }
  }
  
diff --cc source/blender/blenloader/intern/versioning_300.c
index 052801ea355,93e2af1b68e..5da0ab9bcb1
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -28,7 -27,7 +28,8 @@@
  
  #include "DNA_brush_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_types.h"
+ #include "DNA_listBase.h"
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"