svn merge ^/trunk/blender -r42953:42957
authorCampbell Barton <ideasman42@gmail.com>
Thu, 29 Dec 2011 01:58:47 +0000 (01:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 29 Dec 2011 01:58:47 +0000 (01:58 +0000)
1  2 
source/blender/blenlib/CMakeLists.txt

index a439f4eeeca74333fdf7801154a753efaa45527b,03e3b8288ae84225cfb77c0967591b12783df459..56fcde4e91dd78b0f903dededea5d73a1a3e1f33
@@@ -48,7 -48,6 +48,7 @@@ set(SR
        intern/BLI_linklist.c
        intern/BLI_memarena.c
        intern/BLI_mempool.c
 +      intern/BLI_cellalloc.c
        intern/DLRB_tree.c
        intern/boxpack2d.c
        intern/bpath.c
@@@ -66,6 -65,7 +66,7 @@@
        intern/math_base.c
        intern/math_base_inline.c
        intern/math_color.c
+       intern/math_color_inline.c
        intern/math_geom.c
        intern/math_geom_inline.c
        intern/math_matrix.c
@@@ -79,7 -79,6 +80,7 @@@
        intern/rand.c
        intern/rct.c
        intern/scanfill.c
 +      intern/smallhash.c
        intern/storage.c
        intern/string.c
        intern/string_utf8.c
@@@ -90,9 -89,6 +91,9 @@@
        intern/winstuff.c
  
        BLI_array.h
 +      BLI_cellalloc.h
 +      BLI_smallhash.h
 +      BLI_sparsemap.h
        BLI_args.h
        BLI_blenlib.h
        BLI_boxpack2d.h