diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-02-10 14:49:54 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-02-10 14:49:54 +0300 |
| commit | 4c883fd04e7d2c23645bf6fcf4ce521961a3e836 (patch) | |
| tree | e158725a42bcb9afd15c476909195f9d27b95599 /source/blender/blenkernel/intern/object.c | |
| parent | db9d40b9d36fcbc50900bb6e2e134eb8453c2643 (diff) | |
| parent | d76890bfb0bba78d7ad617c5ad8fb284cd9814d4 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 381823754e9..9b5a1614dc0 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1973,7 +1973,8 @@ int BKE_object_visibility(const Object *ob, const int dag_eval_mode) visibility |= OB_VISIBLE_INSTANCES; } - if (ob->runtime.geometry_set_eval != NULL) { + if (ob->runtime.geometry_set_eval != NULL && + BKE_geometry_set_has_instances(ob->runtime.geometry_set_eval)) { visibility |= OB_VISIBLE_INSTANCES; } |