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/intern/lib_id_delete.c
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/intern/lib_id_delete.c')
-rw-r--r--source/blender/blenkernel/intern/lib_id_delete.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index 245e4f43452..9b1abf4d76c 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -188,6 +188,8 @@ void BKE_id_free_ex(Main *bmain, void *idv, int flag, const bool use_flag_from_i
const short type = GS(id->name);
if (bmain && (flag & LIB_ID_FREE_NO_DEG_TAG) == 0) {
+ BLI_assert(bmain->is_locked_for_linking == false);
+
DEG_id_type_tag(bmain, type);
}