[Bf-blender-cvs] [e680a9d80d4] blender2.8: Cleanup LIB_ID_COPY_ flags a bit, add missing comment.

Bastien Montagne noreply at git.blender.org
Mon Aug 6 11:50:00 CEST 2018


Commit: e680a9d80d46a7d76552664a0210ac2750d9ab49
Author: Bastien Montagne
Date:   Mon Aug 6 11:45:56 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe680a9d80d46a7d76552664a0210ac2750d9ab49

Cleanup LIB_ID_COPY_ flags a bit, add missing comment.

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

M	source/blender/blenkernel/BKE_library.h

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

diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index aaf53a2396b..16e05cd136a 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -79,12 +79,14 @@ enum {
 	LIB_ID_COPY_NO_PROXY_CLEAR     = 1 << 16,  /* Object only, needed by make_local code. */
 	LIB_ID_COPY_NO_PREVIEW         = 1 << 17,  /* Do not copy preview data, when supported. */
 	LIB_ID_COPY_CACHES             = 1 << 18,  /* Copy runtime data caches. */
-	/* XXX TODO Do we want to keep that? would rather try to get rid of it... */
-	LIB_ID_COPY_ACTIONS            = 1 << 19,  /* EXCEPTION! Deep-copy actions used by animdata of copied ID. */
-	LIB_ID_COPY_KEEP_LIB           = 1 << 20,  /* Keep the library pointer when copying datablock outside of bmain. */
-	LIB_ID_COPY_NO_ANIMDATA        = 1 << 21,  /* Don't copy id->adt, used by ID datablock localization routines. */
-	LIB_ID_COPY_SHAPEKEY           = 1 << 22,  /* EXCEPTION! Deep-copy shapekeys used by copied obdata ID. */
-	LIB_ID_COPY_CD_REFERENCE       = 1 << 23,
+	LIB_ID_COPY_NO_ANIMDATA        = 1 << 19,  /* Don't copy id->adt, used by ID datablock localization routines. */
+	LIB_ID_COPY_CD_REFERENCE       = 1 << 20,  /* Mesh: Reference CD data layers instead of doing real copy. */
+
+	/* XXX Hackish/not-so-nice specific behaviors needed for some corner cases.
+	 *     Ideally we should not have those, but we need them for now... */
+	LIB_ID_COPY_ACTIONS            = 1 << 24,  /* EXCEPTION! Deep-copy actions used by animdata of copied ID. */
+	LIB_ID_COPY_KEEP_LIB           = 1 << 25,  /* Keep the library pointer when copying datablock outside of bmain. */
+	LIB_ID_COPY_SHAPEKEY           = 1 << 26,  /* EXCEPTION! Deep-copy shapekeys used by copied obdata ID. */
 };
 
 void BKE_libblock_copy_ex(struct Main *bmain, const struct ID *id, struct ID **r_newid, const int flag);



More information about the Bf-blender-cvs mailing list