Merge branch 'blender-v4.1-release'

scripts/modules/bl_i18n_utils/settings.py

@@ -536,6 +536,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
 WARN_MSGID_NOT_CAPITALIZED_ALLOWED |= set(lng[2] for lng in LANGUAGES)
 
 WARN_MSGID_END_POINT_ALLOWED = {
+    "Cannot figure out which object this bone belongs to.",
     "Circle|Alt .",
     "Float Neg. Exp.",
     "Max Ext.",
@@ -543,6 +544,7 @@ WARN_MSGID_END_POINT_ALLOWED = {
     "Not assigned to any bone collection.",
     "Numpad .",
     "Pad.",
+    "Please file a bug report.",
     "    RNA Path: bpy.types.",
     "Temp. Diff.",
     "Temperature Diff.",

scripts/modules/bl_i18n_utils/utils_spell_check.py

@@ -56,6 +56,7 @@ class SpellChecker:
         "ons",  # add-ons
         "pong",  # ping pong
         "procedurals",  # Used as noun
+        "recurse",
         "resumable",
         "runtimes",
         "scalable",
@@ -271,7 +272,7 @@ class SpellChecker:
         "unprotect",
         "unreacted",
         "unreferenced",
-        "unregister", "unregistration",
+        "unregister", "unregistration", "unregistering",
         "unselect", "unselected", "unselectable",
         "unsets",
         "unshadowed",
@@ -413,6 +414,7 @@ class SpellChecker:
         "anisotropic", "anisotropy",
         "arcminute", "arcminutes",
         "arcsecond", "arcseconds",
+        "autokey",
         "bimanual",  # OpenXR?
         "bitangent",
         "boid", "boids",
@@ -466,6 +468,7 @@ class SpellChecker:
         "quartic",
         "quaternion", "quaternions",
         "quintic",
+        "reallocations",
         "samplerate",
         "sandboxed",
         "sawtooth",
@@ -507,6 +510,7 @@ class SpellChecker:
         "chrominance",
         "clearcoat",
         "codec", "codecs",
+        "codepoint",
         "collada",
         "colorspace",
         "compositing",
@@ -814,7 +818,7 @@ class SpellChecker:
         "tma",
         "ui",
         "unix",
-        "uuid",
+        "uuid", "uid",
         "vbo", "vbos",
         "vfx",
         "vmm",

source/blender/compositor/intern/COM_Debug.cc

@@ -2,6 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <iostream>
+
 #include "COM_Debug.h"
 
 #include "BLI_fileops.h"

source/blender/editors/sculpt_paint/sculpt_undo.cc

@@ -1744,6 +1744,7 @@ static void set_active_layer(bContext *C, SculptAttrRef *attr)
     mesh->attributes_for_write().add(
         attr->name, attr->domain, attr->type, bke::AttributeInitDefaultValue());
     layer = BKE_id_attribute_find(&mesh->id, attr->name, attr->type, attr->domain);
+    DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
   }
 
   if (layer) {
@@ -1847,11 +1848,11 @@ static void sculpt_undosys_step_decode_redo(bContext *C, Depsgraph *depsgraph, S
     us_iter = (SculptUndoStep *)us_iter->step.prev;
   }
   while (us_iter && (us_iter->step.is_applied == false)) {
-    set_active_layer(C, &((SculptUndoStep *)us_iter)->active_color_start);
+    set_active_layer(C, &((SculptUndoStep *)us_iter)->active_color_end);
     sculpt_undosys_step_decode_redo_impl(C, depsgraph, us_iter);
 
     if (us_iter == us) {
-      set_active_layer(C, &((SculptUndoStep *)us_iter)->active_color_end);
+      set_active_layer(C, &((SculptUndoStep *)us_iter)->active_color_start);
       break;
     }
     us_iter = (SculptUndoStep *)us_iter->step.next;

source/blender/makesrna/intern/rna_armature.cc

@@ -2037,7 +2037,7 @@ static void rna_def_armature_collections(BlenderRNA *brna, PropertyRNA *cprop)
   RNA_def_property_ui_text(
       prop,
       "Solo Active",
-      "Read-ony flag that indicates there is at least one bone collection marked as 'solo'");
+      "Read-only flag that indicates there is at least one bone collection marked as 'solo'");
   RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
   /* Armature.collections.new(...) */

source/blender/makesrna/intern/rna_userdef.cc

@@ -6662,7 +6662,8 @@ static void rna_def_userdef_filepaths_extension_repo(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "use_remote_path", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, nullptr, "flag", USER_EXTENSION_REPO_FLAG_USE_REMOTE_PATH);
-  RNA_def_property_ui_text(prop, "Use Remote", "Synchonize the repository with a remote URL/path");
+  RNA_def_property_ui_text(
+      prop, "Use Remote", "Synchronize the repository with a remote URL/path");
   RNA_def_property_boolean_funcs(prop, nullptr, "rna_userdef_extension_repo_use_remote_path_set");
 }