Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-05-15 09:53:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-05-15 10:42:01 +0300
commit6a850f3cc840a574d3b5b5af7b608ae3536f96ec (patch)
tree7427864cc1fa2201619f34da5564f1d4a4181f10 /source/blender/blenkernel/BKE_main.h
parentc361f911f9c459364fceea5de5b9d0ea2f91c9e9 (diff)
Fix duplicate ID's being created when appending/linking
This removes grease pencil brush creation/dat-block delete on load, since this causes duplicate data-blocks. Add assert to prevent this happening in the future since the error is isn't obvious.
Diffstat (limited to 'source/blender/blenkernel/BKE_main.h')
-rw-r--r--source/blender/blenkernel/BKE_main.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index ed1f67350c3..62f50fb8ff6 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -105,6 +105,12 @@ typedef struct Main {
*/
char use_memfile_full_barrier;
+ /**
+ * When linking, disallow creation of new data-blocks.
+ * Make sure we don't do this by accident, see T76738.
+ */
+ char is_locked_for_linking;
+
BlendThumbnail *blen_thumb;
struct Library *curlib;