[Bf-blender-cvs] [f761ae8] master: Rework a bit id_us_min, and make it assert on usercount error.

Bastien Montagne noreply at git.blender.org
Mon Nov 9 21:07:48 CET 2015


Commit: f761ae8f116909f1d5c92398f8a4812a5fad8ca4
Author: Bastien Montagne
Date:   Mon Nov 9 20:06:46 2015 +0100
Branches: master
https://developer.blender.org/rBf761ae8f116909f1d5c92398f8a4812a5fad8ca4

Rework a bit id_us_min, and make it assert on usercount error.

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

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

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

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 90cd950..fe5ddb5 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -184,12 +184,11 @@ void id_us_plus(ID *id)
 void id_us_min(ID *id)
 {
 	if (id) {
-		if (id->us < 2 && (id->flag & LIB_FAKEUSER)) {
-			printf("ID user decrement error: %s\n", id->name);
-			id->us = 1;
-		}
-		else if (id->us <= 0) {
-			printf("ID user decrement error: %s\n", id->name);
+		const int limit = (id->flag & LIB_FAKEUSER) ? 1 : 0;
+		if (id->us <= limit) {
+			printf("ID user decrement error: %s (from '%s')\n", id->name, id->lib ? id->lib->filepath : "[Main]");
+			BLI_assert(0);
+			id->us = limit;
 		}
 		else {
 			id->us--;




More information about the Bf-blender-cvs mailing list