diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-18 23:00:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-18 23:00:24 +0300 |
| commit | c59370bf643f6e85473c560c8f5edcf73cc36e8e (patch) | |
| tree | 01339cabbc8ed3f877198e7d2c7364847951be29 | |
| parent | be8202d90bd9bd8e87d5111c45fb412925b2d472 (diff) | |
| parent | 08871b56bc4db884ce127deb0ea247e740efe813 (diff) | |
Merge branch 'blender2.7'
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 2 | ||||
| -rw-r--r-- | intern/cycles/render/shader.cpp | 2 | ||||
| -rw-r--r-- | intern/numaapi/source/numaapi_win32.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index faa5edec810..1813f9a15ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index ac19ed29997..74417ea3151 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -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) diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 11780062e44..a1a9cfd25f3 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -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; } diff --git a/intern/numaapi/source/numaapi_win32.c b/intern/numaapi/source/numaapi_win32.c index e278ef612fd..8f1137a7bea 100644 --- a/intern/numaapi/source/numaapi_win32.c +++ b/intern/numaapi/source/numaapi_win32.c @@ -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) { |