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:
authorJacques Lucke <jacques@blender.org>2020-04-09 13:02:02 +0300
committerJacques Lucke <jacques@blender.org>2020-04-09 13:02:02 +0300
commit55ee66be4d2eaf1bd4556a938c618c77985b4008 (patch)
tree85b445409637fa021c72e096d0d2133fdcf2992a /source/blender/blenkernel/intern/lib_id.c
parent726cf93f8ad09b49cd6481af2c6ad7d5e51b0c20 (diff)
parentdabd59ba23f877f68aaf73e79f0d58118723d9b7 (diff)
Merge branch 'functions' into builtin-simulation-nodesbuiltin-simulation-nodes
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id.c')
-rw-r--r--source/blender/blenkernel/intern/lib_id.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 286ee4a8723..487ec0bf161 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -320,7 +320,11 @@ void id_us_min(ID *id)
id->lib ? id->lib->filepath : "[Main]",
id->us,
limit);
- BLI_assert(0);
+ if (GS(id->name) != ID_IP) {
+ /* Do not assert on deprecated ID types, we cannot really ensure that their ID refcounting
+ * is valid... */
+ BLI_assert(0);
+ }
id->us = limit;
}
else {