Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Nov 2018 13:42:38 +0000 (14:42 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Nov 2018 13:42:38 +0000 (14:42 +0100)
1  2 
build_files/cmake/macros.cmake
intern/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/creator/creator.c

index 948cedfc48e56b6072704f7e19eaa2d11a08a520,2e7ed80184621ea3cc8f737bee13070afaee24bf..e250eae19a4d3b1b21487efe644cbaca7c0e3569
@@@ -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)
index c7f0f414fb1f63fda51a621b64c9bf2ebd0a63ca,4110376652d1a25a9aca7aa5d07f5dbfb2f16cdf..16bbefc1c45cfdf878ec1455a2dd4f827cf86115
@@@ -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)
Simple merge
Simple merge