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

[Sergey Sharybin]

Commit: 3ed0d5b4d4c06a0c88832525a7c55d21a04d86ff
Author: Sergey Sharybin
Date:   Wed Nov 28 14:42:38 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB3ed0d5b4d4c06a0c88832525a7c55d21a04d86ff

Merge branch 'master' into blender2.8

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



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

diff --cc build_files/cmake/macros.cmake
index 948cedfc48e,2e7ed801846..e250eae19a4
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -694,7 -687,7 +694,8 @@@ function(SETUP_BLENDER_SORTED_LIBS
  
  		bf_intern_glew_mx
  		bf_intern_clog
 +		bf_intern_opensubdiv
+ 		bf_intern_numaapi
  	)
  
  	if(NOT WITH_SYSTEM_GLOG)
diff --cc intern/CMakeLists.txt
index c7f0f414fb1,4110376652d..16bbefc1c45
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@@ -30,8 -30,8 +30,9 @@@ add_subdirectory(ghost
  add_subdirectory(guardedalloc)
  add_subdirectory(libmv)
  add_subdirectory(memutil)
+ add_subdirectory(numaapi)
  add_subdirectory(opencolorio)
 +add_subdirectory(opensubdiv)
  add_subdirectory(mikktspace)
  add_subdirectory(glew-mx)
  add_subdirectory(eigen)