From d76890bfb0bba78d7ad617c5ad8fb284cd9814d4 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 10 Feb 2021 12:48:17 +0100 Subject: Fix T85492: fix check if object has visible instances Without this, `OB_VISIBLE_INSTANCES` would be added to `visibility` incorrectly, leading to unexpected visibility changes down the line. --- source/blender/blenkernel/intern/object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/object.c') diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 155508e9caa..70af46569a8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1957,7 +1957,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; } -- cgit v1.2.3