[Bf-blender-cvs] [c9a7789] master: Corrent recent commit: off by one error

Campbell Barton noreply at git.blender.org
Mon Sep 22 05:24:21 CEST 2014


Commit: c9a7789bcff08dce38560a6c44ee92efb653dc2f
Author: Campbell Barton
Date:   Mon Sep 22 13:23:42 2014 +1000
Branches: master
https://developer.blender.org/rBc9a7789bcff08dce38560a6c44ee92efb653dc2f

Corrent recent commit: off by one error

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

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 2795196..500c281 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -71,8 +71,8 @@ void id_clear_lib_data(struct Main *bmain, struct ID *id);
 
 struct ListBase *which_libbase(struct Main *mainlib, short type);
 
-#define MAX_LIBARRAY    34
-int set_listbasepointers(struct Main *main, struct ListBase **lb);
+#define MAX_LIBARRAY    35
+int set_listbasepointers(struct Main *main, struct ListBase *lb[MAX_LIBARRAY]);
 
 void BKE_libblock_free(struct Main *bmain, void *idv);
 void BKE_libblock_free_ex(struct Main *bmain, void *idv, bool do_id_user);
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 15a4a83..b49eee3 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -620,7 +620,7 @@ int set_listbasepointers(Main *main, ListBase **lb)
 	
 	lb[a] = NULL;
 
-	BLI_assert(a == MAX_LIBARRAY);
+	BLI_assert(a + 1 == MAX_LIBARRAY);
 
 	return a;
 }




More information about the Bf-blender-cvs mailing list