diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 14:57:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 14:57:38 +0300 |
| commit | 323a7ab944132335f27ba21519df161d7a3351c9 (patch) | |
| tree | ebccd8e52bcead21faaadbcf4c427293e598061c /source/blender/editors/object | |
| parent | 480def9c5587b710ce478a58985e2e4359c14467 (diff) | |
| parent | a35aae9e4972656c0e619c03aa0b26c903d16b34 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 5 |
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 7df436efdd5..7451268eac9 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2262,6 +2262,11 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer 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; |