diff options
author | Jacques Lucke <jacques@blender.org> | 2021-11-09 19:53:15 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-11-09 19:53:15 +0300 |
commit | a356e4fb3fa35a6dd8fe0e5e395eb05686f1f90f (patch) | |
tree | bcaaedaf91f2210781304cd091b062b0f1fecfd3 | |
parent | 7383f954438f9b6e2e5f09bf77b0389621c0dff4 (diff) | |
parent | 4f246b8bf9567ab77979f36a5a5f20cc2f1a97ab (diff) |
Merge branch 'blender-v3.0-release'
-rw-r--r-- | source/blender/blenkernel/intern/object_dupli.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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); } |