Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-09-22 07:23:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-09-22 07:23:42 +0400
commitc9a7789bcff08dce38560a6c44ee92efb653dc2f (patch)
tree9d655e23203bec71111b1be503229cbdb94485d6 /source/blender/blenkernel
parentd79e11fcc86ba045c4ba7ec4ea3ac658fcb8378a (diff)
Corrent recent commit: off by one error
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_library.h4
-rw-r--r--source/blender/blenkernel/intern/library.c2
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;
}