From c9a7789bcff08dce38560a6c44ee92efb653dc2f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Sep 2014 13:23:42 +1000 Subject: [PATCH] Corrent recent commit: off by one error --- source/blender/blenkernel/BKE_library.h | 4 ++-- source/blender/blenkernel/intern/library.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 27951969e89..500c2813a75 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 15a4a83bef6..b49eee3ea22 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; }