Merge branch 'blender-v2.83-release'

4 files changed, 24 insertions, 12 deletions

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 2d795136b05..133917e441c 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -1092,7 +1092,7 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts, const bool r
   bool r_new = false;
 
   Paint *paint = &ts->gp_paint->paint;
-
+  Brush *brush_prev = paint->brush;
   Brush *brush, *deft_draw;
   /* Airbrush brush. */
   brush = gpencil_brush_ensure(bmain, ts, "Airbrush", OB_MODE_PAINT_GPENCIL, &r_new);
@@ -1180,7 +1180,9 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts, const bool r
   }
 
   /* Set default Draw brush. */
-  BKE_paint_brush_set(paint, deft_draw);
+  if (reset || brush_prev == NULL) {
+    BKE_paint_brush_set(paint, deft_draw);
+  }
 }
 
 /* Create a set of grease pencil Vertex Paint presets. */
@@ -1189,7 +1191,7 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts, const bool
   bool r_new = false;
 
   Paint *vertexpaint = &ts->gp_vertexpaint->paint;
-
+  Brush *brush_prev = vertexpaint->brush;
   Brush *brush, *deft_vertex;
   /* Vertex Draw brush. */
   brush = gpencil_brush_ensure(bmain, ts, "Vertex Draw", OB_MODE_VERTEX_GPENCIL, &r_new);
@@ -1220,7 +1222,9 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts, const bool
   }
 
   /* Set default Vertex brush. */
-  BKE_paint_brush_set(vertexpaint, deft_vertex);
+  if (reset || brush_prev == NULL) {
+    BKE_paint_brush_set(vertexpaint, deft_vertex);
+  }
 }
 
 /* Create a set of grease pencil Sculpt Paint presets. */
@@ -1229,6 +1233,7 @@ void BKE_brush_gpencil_sculpt_presets(Main *bmain, ToolSettings *ts, const bool
   bool r_new = false;
 
   Paint *sculptpaint = &ts->gp_sculptpaint->paint;
+  Brush *brush_prev = sculptpaint->brush;
   Brush *brush, *deft_sculpt;
 
   /* Smooth brush. */
@@ -1287,7 +1292,9 @@ void BKE_brush_gpencil_sculpt_presets(Main *bmain, ToolSettings *ts, const bool
   }
 
   /* Set default brush. */
-  BKE_paint_brush_set(sculptpaint, deft_sculpt);
+  if (reset || brush_prev == NULL) {
+    BKE_paint_brush_set(sculptpaint, deft_sculpt);
+  }
 }
 
 /* Create a set of grease pencil Weight Paint presets. */
@@ -1296,7 +1303,7 @@ void BKE_brush_gpencil_weight_presets(Main *bmain, ToolSettings *ts, const bool
   bool r_new = false;
 
   Paint *weightpaint = &ts->gp_weightpaint->paint;
-
+  Brush *brush_prev = weightpaint->brush;
   Brush *brush, *deft_weight;
   /* Vertex Draw brush. */
   brush = gpencil_brush_ensure(bmain, ts, "Draw Weight", OB_MODE_WEIGHT_GPENCIL, &r_new);
@@ -1306,7 +1313,9 @@ void BKE_brush_gpencil_weight_presets(Main *bmain, ToolSettings *ts, const bool
   deft_weight = brush; /* save default brush. */
 
   /* Set default brush. */
-  BKE_paint_brush_set(weightpaint, deft_weight);
+  if (reset || brush_prev == NULL) {
+    BKE_paint_brush_set(weightpaint, deft_weight);
+  }
 }
 
 struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mode)
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
index e2606473d07..fb5073b3dc7 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
@@ -473,8 +473,8 @@ void stroke_vertex()
     float miter_dot = dot(miter_tan, line_adj);
     /* Break corners after a certain angle to avoid really thick corners. */
     const float miter_limit = 0.5; /* cos(60°) */
-    bool miter_break = (miter_dot < miter_limit) || is_stroke_start || is_stroke_end;
-    miter_tan = (miter_break) ? line : (miter_tan / miter_dot);
+    bool miter_break = (miter_dot < miter_limit);
+    miter_tan = (miter_break || is_stroke_start || is_stroke_end) ? line : (miter_tan / miter_dot);
 
     vec2 miter = rotate_90deg(miter_tan);
 
@@ -487,7 +487,7 @@ void stroke_vertex()
 
     /* Reminder: we packed the cap flag into the sign of stength and thickness sign. */
     if ((is_stroke_start && strength1 > 0.0) || (is_stroke_end && thickness1 > 0.0) ||
-        miter_break) {
+        (miter_break && !is_stroke_start && !is_stroke_end)) {
       screen_ofs += line * x;
     }
 
diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index 62ce34fe556..ee148e0934d 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -291,7 +291,7 @@ static void gpencil_buffer_add_point(gpStrokeVert *verts,
   vert->u_stroke = pt->uv_fac;
   vert->stroke_id = gps->runtime.stroke_start;
   vert->point_id = v;
-  vert->thickness = max_ff(0.0f, gps->thickness * pt->pressure) * (round_cap1 ? 1.0 : -1.0);
+  vert->thickness = max_ff(0.0f, gps->thickness * pt->pressure) * (round_cap1 ? 1.0f : -1.0f);
   /* Tag endpoint material to -1 so they get discarded by vertex shader. */
   vert->mat = (is_endpoint) ? -1 : (gps->mat_nr % GP_MATERIAL_BUFFER_LEN);
 
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 95b204ac004..ff27fa958ef 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -2000,7 +2000,10 @@ void DRW_pass_sort_shgroup_z(DRWPass *pass)
       }
     }
     /* To be sorted a shgroup needs to have at least one draw command.  */
-    BLI_assert(handle != 0);
+    /* FIXME(fclem) In some case, we can still have empty shading group to sort. However their
+     * final order is not well defined.
+     * (see T76730 & D7729). */
+    // BLI_assert(handle != 0);
 
     DRWObjectMatrix *obmats = DRW_memblock_elem_from_handle(DST.vmempool->obmats, &handle);