[Bf-blender-cvs] [29b2a47a8a3] master: Fix T52588: Shape key value driver variables of duplicated object sets refer to old objects.

Bastien Montagne noreply at git.blender.org
Wed Aug 30 17:24:38 CEST 2017


Commit: 29b2a47a8a361d657f2e275b5eebaf412ecafae9
Author: Bastien Montagne
Date:   Wed Aug 30 17:24:06 2017 +0200
Branches: master
https://developer.blender.org/rB29b2a47a8a361d657f2e275b5eebaf412ecafae9

Fix T52588: Shape key value driver variables of duplicated object sets refer to old objects.

Regression since 2.78, to be backported to 2.79.

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

M	source/blender/editors/object/object_add.c

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

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index e4f6d0da38f..74da6817185 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2189,6 +2189,11 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
 		if (didit) {
 			Key *key = BKE_key_from_object(obn);
 
+			Key *oldkey = BKE_key_from_object(ob);
+			if (oldkey != NULL) {
+				ID_NEW_SET(oldkey, key);
+			}
+
 			if (dupflag & USER_DUP_ACT) {
 				bActuator *act;



More information about the Bf-blender-cvs mailing list