[Bf-blender-cvs] [8ad93dd0098] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 8ad93dd0098d8b8356bfce27f716488f9afd653e
Author: Sergey Sharybin
Date:   Mon Apr 16 10:19:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8ad93dd0098d8b8356bfce27f716488f9afd653e

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenlib/CMakeLists.txt
index 5bcf4303a84,f8fc2bfdcff..80a8ef96eb3
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@@ -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