[Bf-blender-cvs] [bda8887e0cd] master: Cleanup: simplify grease pencil preset set logic

[Campbell Barton]

Commit: bda8887e0cdfd2fc035b6f1d97f16120f719c6a3
Author: Campbell Barton
Date:   Thu Jun 10 01:55:44 2021 +1000
Branches: master
https://developer.blender.org/rBbda8887e0cdfd2fc035b6f1d97f16120f719c6a3

Cleanup: simplify grease pencil preset set logic

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

M	source/blender/blenkernel/intern/brush.c

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 20c5af0efb6..fdf9cf21b85 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -1400,13 +1400,11 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts, const bool r
   }
 
   /* 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);
   }
 }