diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-18 18:11:29 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-18 18:11:29 +0300 |
| commit | a2b541bd224f7e29b17402408033d9064d5496d3 (patch) | |
| tree | 169a76537c331d5bb2e172f05730bceccc72041b /source/blender/blenkernel | |
| parent | 264837cb466946899bb58f8c0963311ae87d7b59 (diff) | |
Fix mistake in new ID copy code in 'no allocate' case.
Spotted by @sergey, thanks.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index f60e2824a21..0aacb89c550 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -529,7 +529,7 @@ bool BKE_id_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int flag, con ID_IP /* Deprecated */ BLI_assert(test || (r_newid != NULL)); - if (r_newid != NULL) { + if (r_newid != NULL && (flag & LIB_ID_CREATE_NO_ALLOCATE) == 0) { *r_newid = NULL; } if (id == NULL) { |