Merge branch 'blender-v4.1-release'

scripts/modules/bl_keymap_utils/versioning.py

@@ -141,9 +141,13 @@ def keyconfig_update(keyconfig_data, keyconfig_version):
 
     if keyconfig_version <= (4, 1, 5):
         remove_properties({
-            "transform.translate": ["alt_navigation"],
-            "transform.rotate": ["alt_navigation"],
+            "transform.edge_slide": ["alt_navigation"],
             "transform.resize": ["alt_navigation"],
+            "transform.rotate": ["alt_navigation"],
+            "transform.shrink_fatten": ["alt_navigation"],
+            "transform.transform": ["alt_navigation"],
+            "transform.translate": ["alt_navigation"],
+            "transform.vert_slide": ["alt_navigation"],
             "view3d.edit_mesh_extrude_move_normal": ["alt_navigation"],
             "armature.extrude_move": ["TRANSFORM_OT_translate"],
             "curve.extrude_move": ["TRANSFORM_OT_translate"],

source/blender/editors/sculpt_paint/paint_mask.cc

@@ -32,6 +32,7 @@
 #include "BKE_brush.hh"
 #include "BKE_ccg.h"
 #include "BKE_context.hh"
+#include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_multires.hh"
@@ -2075,6 +2076,12 @@ static int sculpt_trim_gesture_box_invoke(bContext *C, wmOperator *op, const wmE
   Object *ob = CTX_data_active_object(C);
   SculptSession *ss = ob->sculpt;
 
+  const View3D *v3d = CTX_wm_view3d(C);
+  const Base *base = CTX_data_active_base(C);
+  if (!BKE_base_is_visible(v3d, base)) {
+    return OPERATOR_CANCELLED;
+  }
+
   SculptCursorGeometryInfo sgi;
   const float mval_fl[2] = {float(event->mval[0]), float(event->mval[1])};
   SCULPT_vertex_random_access_ensure(ss);
@@ -2120,6 +2127,12 @@ static int sculpt_trim_gesture_lasso_invoke(bContext *C, wmOperator *op, const w
   Object *ob = CTX_data_active_object(C);
   SculptSession *ss = ob->sculpt;
 
+  const View3D *v3d = CTX_wm_view3d(C);
+  const Base *base = CTX_data_active_base(C);
+  if (!BKE_base_is_visible(v3d, base)) {
+    return OPERATOR_CANCELLED;
+  }
+
   SculptCursorGeometryInfo sgi;
   const float mval_fl[2] = {float(event->mval[0]), float(event->mval[1])};
   SCULPT_vertex_random_access_ensure(ss);

source/blender/editors/sculpt_paint/sculpt_detail.cc

@@ -20,6 +20,7 @@
 #include "DNA_mesh_types.h"
 
 #include "BKE_context.hh"
+#include "BKE_layer.hh"
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 #include "BKE_screen.hh"
@@ -272,6 +273,12 @@ static int sample_detail(bContext *C, const int event_xy[2], int mode)
     return OPERATOR_CANCELLED;
   }
 
+  const View3D *v3d = CTX_wm_view3d(C);
+  const Base *base = CTX_data_active_base(C);
+  if (!BKE_base_is_visible(v3d, base)) {
+    return OPERATOR_CANCELLED;
+  }
+
   const int mval[2] = {
       event_xy[0] - region->winrct.xmin,
       event_xy[1] - region->winrct.ymin,

source/blender/editors/sculpt_paint/sculpt_expand.cc

@@ -25,6 +25,7 @@
 #include "BKE_colortools.hh"
 #include "BKE_context.hh"
 #include "BKE_image.h"
+#include "BKE_layer.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_mapping.hh"
 #include "BKE_paint.hh"
@@ -2139,6 +2140,12 @@ static int sculpt_expand_invoke(bContext *C, wmOperator *op, const wmEvent *even
   SculptSession *ss = ob->sculpt;
   Mesh *mesh = static_cast<Mesh *>(ob->data);
 
+  const View3D *v3d = CTX_wm_view3d(C);
+  const Base *base = CTX_data_active_base(C);
+  if (!BKE_base_is_visible(v3d, base)) {
+    return OPERATOR_CANCELLED;
+  }
+
   SCULPT_stroke_id_next(ob);
 
   /* Create and configure the Expand Cache. */