[Bf-blender-cvs] [4f246b8bf95] blender-v3.0-release: Fix T92908: print warning when instance recursion limit is reached

Jacques Lucke noreply at git.blender.org
Tue Nov 9 17:52:49 CET 2021


Commit: 4f246b8bf9567ab77979f36a5a5f20cc2f1a97ab
Author: Jacques Lucke
Date:   Tue Nov 9 17:52:40 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB4f246b8bf9567ab77979f36a5a5f20cc2f1a97ab

Fix T92908: print warning when instance recursion limit is reached

Currently we have a fixed instance recursion limit. While we want to lift this
limitation at some point, that is out of scope for a bug fix. For now just print
a warning to make it easier to detect the issue.

Differential Revision: https://developer.blender.org/D13162

===================================================================

M	source/blender/blenkernel/intern/object_dupli.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc
index 666a31a9e3f..442755be15d 100644
--- a/source/blender/blenkernel/intern/object_dupli.cc
+++ b/source/blender/blenkernel/intern/object_dupli.cc
@@ -166,6 +166,10 @@ static void copy_dupli_context(
   r_ctx->persistent_id[r_ctx->level] = index;
   ++r_ctx->level;
 
+  if (r_ctx->level == MAX_DUPLI_RECUR - 1) {
+    std::cerr << "Warning: Maximum instance recursion level reached.\n";
+  }
+
   r_ctx->gen = get_dupli_generator(r_ctx);
 }



More information about the Bf-blender-cvs mailing list