[Bf-blender-cvs] [f2c5ea2] master: Fix own error w/ undefined behavior

[Campbell Barton]

Commit: f2c5ea2516e3912045b4b7d0ecff50e808998efa
Author: Campbell Barton
Date:   Mon Jun 13 21:55:54 2016 +1000
Branches: master
https://developer.blender.org/rBf2c5ea2516e3912045b4b7d0ecff50e808998efa

Fix own error w/ undefined behavior

This happened to work for me but caused issues on OSX.

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

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

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

diff --git a/source/blender/blenkernel/intern/library_idmap.c 
b/source/blender/blenkernel/intern/library_idmap.c
index fd78d9b..66025c0 100644
--- a/source/blender/blenkernel/intern/library_idmap.c
+++ b/source/blender/blenkernel/intern/library_idmap.c
@@ -88,8 +88,10 @@ struct IDNameLib_Map *BKE_main_idmap_create(struct Main 
*bmain)
 
        int index = 0;
        while (index < MAX_LIBARRAY) {
-               id_map->type_maps[index].map = NULL;
-               id_map->type_maps[index].id_type = BKE_idcode_iter_step(&index);
+               struct IDNameLib_TypeMap *type_map = &id_map->type_maps[index];
+               type_map->map = NULL;
+               type_map->id_type = BKE_idcode_iter_step(&index);
+               BLI_assert(type_map->id_type != 0);
        }
        BLI_assert(index == MAX_LIBARRAY);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs