[Bf-blender-cvs] [b415ed55a74] master: Fix critical issue with our DNA ID tags (two totally different tags having same value).

Bastien Montagne noreply at git.blender.org
Thu Jan 11 14:32:49 CET 2018


Commit: b415ed55a74c51b944cd0682fc7a81679778ac8f
Author: Bastien Montagne
Date:   Thu Jan 11 14:26:44 2018 +0100
Branches: master
https://developer.blender.org/rBb415ed55a74c51b944cd0682fc7a81679778ac8f

Fix critical issue with our DNA ID tags (two totally different tags having same value).

Nice typo from rBc4046e9082f6, tssk. ;)

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

M	source/blender/makesdna/DNA_ID.h

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

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 81c0b6f656b..80640d8dffe 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -349,7 +349,7 @@ enum {
 	LIB_TAG_PRE_EXISTING    = 1 << 11,
 
 	/* RESET_NEVER tag datablock for freeing etc. behavior (usually set when copying real one into temp/runtime one). */
-	LIB_TAG_NO_MAIN          = 1 << 11,  /* Datablock is not listed in Main database. */
+	LIB_TAG_NO_MAIN          = 1 << 12,  /* Datablock is not listed in Main database. */
 	LIB_TAG_NO_USER_REFCOUNT = 1 << 13,  /* Datablock does not refcount usages of other IDs. */
 	/* Datablock was not allocated by standard system (BKE_libblock_alloc), do not free its memory
 	 * (usual type-specific freeing is called though). */



More information about the Bf-blender-cvs mailing list