[Bf-blender-cvs] [a2b541bd224] master: Fix mistake in new ID copy code in 'no allocate' case.

[Bastien Montagne]

Commit: a2b541bd224f7e29b17402408033d9064d5496d3
Author: Bastien Montagne
Date:   Wed Oct 18 17:11:29 2017 +0200
Branches: master
https://developer.blender.org/rBa2b541bd224f7e29b17402408033d9064d5496d3

Fix mistake in new ID copy code in 'no allocate' case.

Spotted by @sergey, thanks.

===================================================================

M	source/blender/blenkernel/intern/library.c

===================================================================

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) {