Merge branch 'blender-v2.92-release'

2021-02-10 12:49:54 +01:00
parent db9d40b9d3 d76890bfb0
commit 4c883fd04e
1 changed files with 2 additions and 1 deletions
--- 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;
  }