Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2018 08:19:03 +0000 (10:19 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2018 08:19:03 +0000 (10:19 +0200)
1  2 
source/blender/blenkernel/intern/icons.c
source/blender/blenlib/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt

index 5bcf4303a841563bc1a273f1d108d5b5dcad1ff1,f8fc2bfdcff515be9a3f9f16047861c3e66e1e2a..80a8ef96eb3bb10e0f21ddc188e1c38e5ca0166d
@@@ -50,8 -50,8 +50,9 @@@ set(SR
        intern/BLI_kdopbvh.c
        intern/BLI_kdtree.c
        intern/BLI_linklist.c
+       intern/BLI_linklist_lockfree.c
        intern/BLI_memarena.c
 +      intern/BLI_memiter.c
        intern/BLI_mempool.c
        intern/DLRB_tree.c
        intern/array_store.c
Simple merge