@@ -5805,2 +5806,4 @@
     ss->face_sets = BKE_sculpt_face_sets_ensure(mesh);
   }
+  else {
+    if (ss->shapekey_active && (ss->shapekey_active->flag & KEYBLOCK_LOCKED_SHAPE) != 0) {

@@ -266,0 +268,4 @@
+
+def object_check_active_shape_key_unlocked(obj, operator=None):
+    """
+    Checks that the active shape key of the specified object is not locked.

@@ -266,0 +276,4 @@
+    :type operator: :class:`bpy.types.Operator`
+    :return: True if the object has no shape keys, or the active one is unlocked.
+    """
+    if obj:

@@ -89,3 +89,3 @@
 struct KeyBlock *BKE_keyblock_add_ctime(struct Key *key, const char *name, bool do_force);
 /**
- * Get the appropriate #KeyBlock given an index.
+ * Get the appropriate #KeyBlock given an index, excluding the first (0th) key. Key may be null.

@@ -94,0 +94,4 @@
+/**
+ * Get the appropriate #KeyBlock given an index. Key may be null.
+ */
+struct KeyBlock *BKE_keyblock_find_index(struct Key *key, int index);

@@ -1930,1 +1925,4 @@
 
+KeyBlock *BKE_keyblock_find_index(Key *key, int index)
+{
+  if (key) {

@@ -2892,3 +2926,3 @@
   MEM_freeN(objects);
 
-  return OPERATOR_FINISHED;
+  return totobjects ? OPERATOR_FINISHED : OPERATOR_CANCELLED;

@@ -2878,3 +2905,3 @@
   MEM_freeN(objects);
 
-  if (tot_unselected == objects_len) {
+  if (tot_selected == 0 && !tot_locked) {

@@ -2881,4 +2908,3 @@
     BKE_report(op->reports, RPT_WARNING, "No selected vertex");
-    return OPERATOR_CANCELLED;
   }
 

@@ -294,3 +297,3 @@
 
 struct SculptGestureOperation {
-  /* Initial setup (data updates, special undo push...). */
+  /* Initial setup (data updates...) before the undo push. */

@@ -698,3 +706,3 @@
 }
 
-static void sculpt_gesture_apply(bContext *C, SculptGestureContext *sgcontext, wmOperator *op)
+static bool sculpt_gesture_apply(bContext *C, SculptGestureContext *sgcontext, wmOperator *op)

@@ -703,3 +716,3 @@
   SCULPT_undo_push_begin(CTX_data_active_object(C), op);
 
-  operation->sculpt_gesture_begin(C, sgcontext);
+  if (operation->sculpt_gesture_begin) {

@@ -722,0 +737,4 @@
+  return true;
+}
+
+static int sculpt_gesture_apply_and_free(bContext *C,

@@ -722,0 +743,4 @@
+{
+  const bool ok = sculpt_gesture_apply(C, sgcontext, op);
+
+  sculpt_gesture_context_free(sgcontext);

@@ -730,3 +757,3 @@
 };
 
-static void sculpt_gesture_face_set_begin(bContext *C, SculptGestureContext *sgcontext)
+static bool sculpt_gesture_face_set_init(bContext *C, SculptGestureContext *sgcontext)

@@ -5869,2 +5885,4 @@
     ss->face_sets = BKE_sculpt_face_sets_ensure(ob);
   }
+  else { /* Other, non-attribute sculpt tools */
+    if (!ED_sculpt_check_shape_key_unlocked(ob, op->reports)) {

@@ -89,0 +94,4 @@
+
+  if (key_block && (key_block->flag & KEYBLOCK_LOCKED_SHAPE) != 0) {
+    if (reports) {
+      BKE_report(reports, RPT_ERROR, "The active shape key is locked");