diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-15 10:47:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-15 10:47:58 +0300 |
| commit | 20c25bffda0df4260e13bda697347ce830857b7a (patch) | |
| tree | ec68fc90ef33bb2463c1f34cf6bb254cf91e9596 /source/blender/blenkernel/intern/lib_id.c | |
| parent | 656692913beb0d47f41a21db53fc4c310e2fb203 (diff) | |
| parent | 6a850f3cc840a574d3b5b5af7b608ae3536f96ec (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index d8b63f0f527..9ef5c549235 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -963,6 +963,8 @@ void *BKE_libblock_alloc(Main *bmain, short type, const char *name, const int fl id->us = 1; } if ((flag & LIB_ID_CREATE_NO_MAIN) == 0) { + /* Note that 2.8x versioning has tested not to cause conflicts. */ + BLI_assert(bmain->is_locked_for_linking == false || ELEM(type, ID_WS, ID_GR)); ListBase *lb = which_libbase(bmain, type); BKE_main_lock(bmain); |