[Bf-blender-cvs] [546dfd6963d] temp-T95933-object-mode-curve-selection: Merge branch 'master' into temp-T95933-object-mode-curve-selection

[Jeroen Bakker]

Commit: 546dfd6963d7480123157586445015de1c660342
Author: Jeroen Bakker
Date:   Fri Jul 8 07:43:04 2022 +0200
Branches: temp-T95933-object-mode-curve-selection
https://developer.blender.org/rB546dfd6963d7480123157586445015de1c660342

Merge branch 'master' into temp-T95933-object-mode-curve-selection

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



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

diff --cc source/blender/draw/engines/overlay/overlay_engine.c
index d4d6737e439,9ec0398e5cb..5edd68bffff
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@@ -308,10 -310,10 +310,12 @@@ static void OVERLAY_cache_populate(voi
                                       (pd->ctx_mode == CTX_MODE_PARTICLE);
    const bool in_paint_mode = (ob == draw_ctx->obact) &&
                               (draw_ctx->object_mode & OB_MODE_ALL_PAINT);
 +  const bool in_sculpt_curve_mode = (ob == draw_ctx->obact) &&
 +                                    (draw_ctx->object_mode & OB_MODE_SCULPT_CURVES);
    const bool in_sculpt_mode = (ob == draw_ctx->obact) && (ob->sculpt != NULL) &&
                                (ob->sculpt->mode_type == OB_MODE_SCULPT);
+   const bool in_curves_sculpt_mode = (ob == draw_ctx->obact) &&
+                                      (ob->mode == OB_MODE_SCULPT_CURVES);
    const bool has_surface = ELEM(ob->type,
                                  OB_MESH,
                                  OB_CURVES_LEGACY,