[Bf-blender-cvs] [68c4ba34821] blender-v2.93-release: Fix T87522: frame selected does not take instances into account
Jacques Lucke
noreply at git.blender.org
Fri Apr 16 13:43:38 CEST 2021
Commit: 68c4ba348213b66543cdcd21da755fefaf286ef2
Author: Jacques Lucke
Date: Fri Apr 16 13:43:29 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB68c4ba348213b66543cdcd21da755fefaf286ef2
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..
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list