[Bf-blender-cvs] [1004a7d] master: Correct MAX_LIBARRAY define, assert when its wrong

Campbell Barton noreply at git.blender.org
Mon Sep 22 04:05:41 CEST 2014


Commit: 1004a7db977064b438814b1d11ce513b5e1799fa
Author: Campbell Barton
Date:   Mon Sep 22 12:03:55 2014 +1000
Branches: master
https://developer.blender.org/rB1004a7db977064b438814b1d11ce513b5e1799fa

Correct MAX_LIBARRAY define, assert when its wrong

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

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

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

diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 1d37f9e..2795196 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -71,7 +71,7 @@ void id_clear_lib_data(struct Main *bmain, struct ID *id);
 
 struct ListBase *which_libbase(struct Main *mainlib, short type);
 
-#define MAX_LIBARRAY    43
+#define MAX_LIBARRAY    34
 int set_listbasepointers(struct Main *main, struct ListBase **lb);
 
 void BKE_libblock_free(struct Main *bmain, void *idv);
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 515287d..15a4a83 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -620,6 +620,8 @@ int set_listbasepointers(Main *main, ListBase **lb)
 	
 	lb[a] = NULL;
 
+	BLI_assert(a == MAX_LIBARRAY);
+
 	return a;
 }




More information about the Bf-blender-cvs mailing list