diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-01 11:44:31 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-01 11:44:31 +0300 |
| commit | 98c767244d438bc4b62149b85af061e32d5a770a (patch) | |
| tree | 1f020c2e114e888f55d3d70402ee6e29929c1d5e /source/blender/makesrna | |
| parent | aad0e52e38581854a6ab6c6fcb0f35d5054d5bbf (diff) | |
| parent | 2ce94cc24b2ce5fdb89ae5d503aaabe22687e285 (diff) | |
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 3c940e3dcbf..6eed4153e0d 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -601,7 +601,7 @@ bool rna_AnimaData_override_apply( if (adt_dst == NULL && adt_src != NULL) { /* Copy anim data from reference into final local ID. */ - BKE_animdata_copy_id(NULL, ptr_dst->id.data, ptr_src->id.data, false); + BKE_animdata_copy_id(NULL, ptr_dst->id.data, ptr_src->id.data, false, true); return true; } else if (adt_dst != NULL && adt_src == NULL) { |