Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 18 Jan 2019 20:00:24 +0000 (21:00 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 18 Jan 2019 20:00:24 +0000 (21:00 +0100)
CMakeLists.txt
build_files/cmake/config/blender_release.cmake
intern/cycles/render/shader.cpp
intern/numaapi/source/numaapi_win32.c

index faa5ede..1813f9a 100644 (file)
@@ -411,7 +411,7 @@ option(WITH_CYCLES_CUDA_BINARIES    "Build Cycles CUDA binaries" OFF)
 option(WITH_CYCLES_CUBIN_COMPILER      "Build cubins with nvrtc based compiler instead of nvcc" OFF)
 option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
 mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_72 sm_75 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING     "Build Cycles with logging support" ON)
index ac19ed2..74417ea 100644 (file)
@@ -52,7 +52,7 @@ set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
 
 set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_CUDA_BINARIES ON  CACHE BOOL "" FORCE)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_72;sm_75 CACHE STRING "" FORCE)
+set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
 
 # platform dependent options
 if(UNIX AND NOT APPLE)
index 1178006..a1a9cfd 100644 (file)
@@ -647,7 +647,7 @@ void ShaderManager::get_requested_graph_features(ShaderGraph *graph,
                                                          node->get_group());
                requested_features->nodes_features |= node->get_feature();
                if(node->special_type == SHADER_SPECIAL_TYPE_CLOSURE) {
-                       BsdfNode *bsdf_node = static_cast<BsdfNode*>(node);
+                       BsdfBaseNode *bsdf_node = static_cast<BsdfBaseNode*>(node);
                        if(CLOSURE_IS_VOLUME(bsdf_node->closure)) {
                                requested_features->nodes_features |= NODE_FEATURE_VOLUME;
                        }
index e278ef6..8f1137a 100644 (file)
@@ -163,7 +163,7 @@ NUMAAPI_Result numaAPI_Initialize(void) {
 ////////////////////////////////////////////////////////////////////////////////
 // Internal helpers.
 
-static int countNumSetBits(int64_t mask) {
+static int countNumSetBits(ULONGLONG mask) {
   // TODO(sergey): There might be faster way calculating number of set bits.
   int num_bits = 0;
   while (mask != 0) {