Merge branch 'blender-v3.0-release'

2021-11-09 17:53:15 +01:00 · 2021-11-09 17:53:15 +01:00 · a356e4fb3f
parent 7383f95443 4f246b8bf9
commit a356e4fb3f
1 changed files with 4 additions and 0 deletions
--- 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);
 }