Merge branch 'blender-v4.2-release'

CMakeLists.txt

@@ -1230,6 +1230,9 @@ set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_CYCLES_OSL OFF)
 # Hydra requires USD.
 set_and_warn_dependency(WITH_USD WITH_HYDRA OFF)
 
+# The Ocean modifier requires FFTW3.
+set_and_warn_dependency(WITH_FFTW3 WITH_MOD_OCEANSIM OFF)
+
 if(NOT WITH_CYCLES)
   set(WITH_CYCLES_OSL OFF)
 endif()
@@ -1433,10 +1436,6 @@ endif()
 # -----------------------------------------------------------------------------
 # Common Checks for Compatible Options
 
-if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
-  message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
-endif()
-
 if(WITH_INTERNATIONAL)
   if(NOT WITH_BOOST)
     message(

source/blender/nodes/shader/node_shader_tree.cc

@@ -1039,6 +1039,11 @@ static void iter_shader_to_rgba_depth_count(bNode *node,
     depth_level++;
     max_depth = std::max(max_depth, depth_level);
   }
+
+  if (node->runtime->tmp_flag >= depth_level) {
+    /* We already iterated this branch at this or a greater depth. */
+    return;
+  }
   node->runtime->tmp_flag = std::max(node->runtime->tmp_flag, depth_level);
 
   LISTBASE_FOREACH (bNodeSocket *, sock, &node->inputs) {