Merge branch 'blender-v4.2-release'

intern/cycles/integrator/render_scheduler.cpp

@@ -946,12 +946,14 @@ int RenderScheduler::get_num_samples_during_navigation(int resolution_divider) c
     return 1;
   }
 
-  /* Schedule samples equal to the resolution divider up to a maximum of 4.
+  /* Schedule samples equal to the resolution divider up to a maximum of 4, limited by the maximum
+   * number of samples overall.
    * The idea is to have enough information on the screen by increasing the sample count as the
    * resolution is decreased. */
+  const int max_navigation_samples = min(num_samples_, 4);
   /* NOTE: Changing this formula will change the formula in
    * `RenderScheduler::calculate_resolution_divider_for_time()`. */
-  return min(max(1, resolution_divider / pixel_size_), 4);
+  return min(max(1, resolution_divider / pixel_size_), max_navigation_samples);
 }
 
 bool RenderScheduler::work_need_adaptive_filter() const

source/blender/blenkernel/intern/undo_system.cc

@@ -33,6 +33,9 @@
 
 #include "MEM_guardedalloc.h"
 
+/* Header to pull symbols from the file which otherwise might get stripped away. */
+#include "BKE_blender_undo.hh"
+
 #define undo_stack _wm_undo_stack_disallow /* pass in as a variable always. */
 
 /** Odd requirement of Blender that we always keep a memfile undo in the stack. */
@@ -63,6 +66,15 @@ const UndoType *BKE_UNDOSYS_TYPE_TEXT = nullptr;
 
 static ListBase g_undo_types = {nullptr, nullptr};
 
+/* An unused function with public linkage just to ensure symbols from the blender_undo.cc are not
+ * stripped. */
+void bke_undo_system_linker_workaround();
+void bke_undo_system_linker_workaround()
+{
+  BLI_assert_unreachable();
+  BKE_memfile_undo_free(nullptr);
+}
+
 static const UndoType *BKE_undosys_type_from_context(bContext *C)
 {
   LISTBASE_FOREACH (const UndoType *, ut, &g_undo_types) {

source/blender/editors/undo/CMakeLists.txt

@@ -28,6 +28,7 @@ set(LIB
   bf_blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::dna
+  bf_editor_armature
   bf_editor_curve
   bf_editor_curves
   bf_editor_lattice

source/blender/windowmanager/CMakeLists.txt

@@ -101,6 +101,7 @@ set(LIB
   PRIVATE bf::depsgraph
   PRIVATE bf::dna
   bf_editor_screen
+  bf_editor_undo
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc