[Bf-blender-cvs] [fdd4b03f33d] blender2.8: Correction on the last commit.

Germano noreply at git.blender.org
Wed Jul 25 00:45:13 CEST 2018


Commit: fdd4b03f33da4f046faa72b77dc0e77289afda0b
Author: Germano
Date:   Tue Jul 24 19:45:03 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBfdd4b03f33da4f046faa72b77dc0e77289afda0b

Correction on the last commit.

===================================================================

M	source/blender/editors/transform/transform_snap_object.c

===================================================================

diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 95ce26beed1..7116923e678 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -216,17 +216,17 @@ static void iter_snap_objects(
 		    !((snap_select == SNAP_NOT_SELECTED && ((base->flag & BASE_SELECTED) || (base->flag_legacy & BA_WAS_SEL))) ||
 		      (snap_select == SNAP_NOT_ACTIVE && base == base_act)))
 		{
-			Object *obj = base->object;
-			if (obj->transflag & OB_DUPLI) {
+			Object *obj_eval = DEG_get_evaluated_object(sctx->depsgraph, base->object);
+			if (obj_eval->transflag & OB_DUPLI) {
 				DupliObject *dupli_ob;
-				ListBase *lb = object_duplilist(sctx->depsgraph, sctx->scene, obj);
+				ListBase *lb = object_duplilist(sctx->depsgraph, sctx->scene, obj_eval);
 				for (dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next) {
 					sob_callback(sctx, use_object_edit_cage, dupli_ob->ob, dupli_ob->mat, data);
 				}
 				free_object_duplilist(lb);
 			}
 
-			sob_callback(sctx, use_object_edit_cage, obj, obj->obmat, data);
+			sob_callback(sctx, use_object_edit_cage, obj_eval, obj_eval->obmat, data);
 		}
 	}
 }



More information about the Bf-blender-cvs mailing list