[Bf-blender-cvs] [7f7efe78cee] master: Silence CLOG error about usercount of deprecated IPO IDs.

Bastien Montagne noreply at git.blender.org
Wed Oct 7 10:18:50 CEST 2020


Commit: 7f7efe78ceeb2d5f7b6d1049f97a410c11701c99
Author: Bastien Montagne
Date:   Wed Oct 7 10:18:05 2020 +0200
Branches: master
https://developer.blender.org/rB7f7efe78ceeb2d5f7b6d1049f97a410c11701c99

Silence CLOG error about usercount of deprecated IPO IDs.

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

M	source/blender/blenkernel/intern/lib_id.c

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

diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 675e3956102..8f3d05ce914 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -281,15 +281,15 @@ void id_us_min(ID *id)
     const int limit = ID_FAKE_USERS(id);
 
     if (id->us <= limit) {
-      CLOG_ERROR(&LOG,
-                 "ID user decrement error: %s (from '%s'): %d <= %d",
-                 id->name,
-                 id->lib ? id->lib->filepath_abs : "[Main]",
-                 id->us,
-                 limit);
       if (GS(id->name) != ID_IP) {
         /* Do not assert on deprecated ID types, we cannot really ensure that their ID refcounting
          * is valid... */
+        CLOG_ERROR(&LOG,
+                   "ID user decrement error: %s (from '%s'): %d <= %d",
+                   id->name,
+                   id->lib ? id->lib->filepath_abs : "[Main]",
+                   id->us,
+                   limit);
         BLI_assert(0);
       }
       id->us = limit;



More information about the Bf-blender-cvs mailing list