diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-04-22 15:58:52 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-04-22 15:58:52 +0300 |
| commit | f6efacfec74e0c20fffc75e05007df01536d8924 (patch) | |
| tree | 645dd45e29c1950bde7ac5f0ff1219b9be6270e9 | |
| parent | c3701e230353ee70cf6f880aa6c5a1a4ba2ab330 (diff) | |
| parent | 80536e8bae3ef92b894f2005bcf3f96865234e51 (diff) | |
Merge branch 'blender-v2.93-release'
| -rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 3277baeba5b..ce3f519271f 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -500,10 +500,12 @@ static void iter_snap_objects(SnapObjectContext *sctx, } Object *obj_eval = DEG_get_evaluated_object(depsgraph, base->object); - if (obj_eval->transflag & OB_DUPLI) { - DupliObject *dupli_ob; + if (obj_eval->transflag & OB_DUPLI || + (obj_eval->runtime.geometry_set_eval != NULL && + BKE_geometry_set_has_instances(obj_eval->runtime.geometry_set_eval))) { ListBase *lb = object_duplilist(depsgraph, sctx->scene, obj_eval); - for (dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next) { + for (DupliObject *dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next) { + BLI_assert(DEG_is_evaluated_object(dupli_ob->ob)); sob_callback(sctx, dupli_ob->ob, dupli_ob->mat, |