diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-25 18:00:19 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-25 18:00:19 +0300 |
| commit | 99c5bd0cd9e407940817ece6a4155788e392f795 (patch) | |
| tree | aa235df852a77567b04bdbe9956d8afbd3b82212 /source/blender/blenkernel | |
| parent | 75e0767849c1f130be5a023babebbc6aefa4fae3 (diff) | |
| parent | 89bcc80c254590f451e6d503d3b4470999a5b98a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index c0eb9e77087..c08a8c4aa4c 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1429,6 +1429,7 @@ void BKE_libblock_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int fla #endif /* the duplicate should get a copy of the animdata */ + BLI_assert((flag & LIB_ID_COPY_ACTIONS) == 0 || (flag & LIB_ID_CREATE_NO_MAIN) == 0); id_copy_animdata(bmain, new_id, (flag & LIB_ID_COPY_ACTIONS) != 0 && (flag & LIB_ID_CREATE_NO_MAIN) == 0); if ((flag & LIB_ID_CREATE_NO_DEG_TAG) == 0 && (flag & LIB_ID_CREATE_NO_MAIN) == 0) { |