Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-08-30 18:24:06 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-09-04 13:56:57 +0300
commite9ca9dd5d780db7a355a4a4d8625d0896c01d4a7 (patch)
tree6644b0f537ee98e451a0e375641c621dd48ce055 /source
parent82a6889d83d24066636b24c84a70fc18c1ddc7c3 (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_add.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index a925abaecbc..d35ad28fc1f 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2185,6 +2185,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;