[Bf-blender-cvs] [995a1815f5f] blender2.8: Fix T55408: Double transforms on parents/children.

Bastien Montagne noreply at git.blender.org
Fri Jun 15 12:19:40 CEST 2018


Commit: 995a1815f5fd396846f570da761c07e5a09532f2
Author: Bastien Montagne
Date:   Fri Jun 15 12:17:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB995a1815f5fd396846f570da761c07e5a09532f2

Fix T55408: Double transforms on parents/children.

object.base_flag was not synced back from evaluated ID to original one.
Similar thing as copying back to original transform matrix, avoids
having to get data from evaluated one in lots of cases.

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

M	source/blender/blenkernel/intern/object_update.c

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

diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index c1bda070bd8..4c38940b11d 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -404,6 +404,12 @@ void BKE_object_eval_flush_base_flags(Depsgraph *depsgraph,
 		object->base_flag &= ~(BASE_SELECTED | BASE_SELECTABLED);
 	}
 
+	/* Copy to original object datablock if needed. */
+	if (DEG_is_active(depsgraph)) {
+		Object *object_orig = DEG_get_original_object(object);
+		object_orig->base_flag = object->base_flag;
+	}
+
 	if (object->mode == OB_MODE_PARTICLE_EDIT) {
 		for (ParticleSystem *psys = object->particlesystem.first;
 		     psys != NULL;



More information about the Bf-blender-cvs mailing list