Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-04-16 14:43:29 +0300
committerJacques Lucke <jacques@blender.org>2021-04-16 14:43:29 +0300
commit68c4ba348213b66543cdcd21da755fefaf286ef2 (patch)
tree5e15d9c5540c2e679c583689704277d5031fa1e2 /source/blender/blenkernel/intern/object.c
parent1266df87c86067d7c2d18ef71dd0e5520de1a382 (diff)
Fix T87522: frame selected does not take instances into account
`ob->runtime.geometry_set_eval` can contain instances as well. This only affected instances generated by geometry nodes. We should probably have a separate function that tells us if an object has instances or not..
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 5eb935f4651..160fb93b835 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -4135,7 +4135,7 @@ bool BKE_object_minmax_dupli(Depsgraph *depsgraph,
const bool use_hidden)
{
bool ok = false;
- if ((ob->transflag & OB_DUPLI) == 0) {
+ if ((ob->transflag & OB_DUPLI) == 0 && ob->runtime.geometry_set_eval == NULL) {
return ok;
}