blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender2.7'

This commit is contained in:
Brecht Van Lommel 2019-01-18 21:00:24 +01:00
parent be8202d90b 08871b56bc
commit c59370bf64
Notes: blender-bot 2023-02-14 04:41:34 +01:00 
Referenced by issue #61070, Blender 2.80 renaming parent directory of .blend files to "New Folder"
Referenced by issue #60832, Blender 2.8 crashes after applying explode modifier on objects.
Referenced by issue #60792, Possible bug in "bpy.data.libraries.write()"
Referenced by issue #60722, Decimate modifier not working in operator settings
Referenced by issue #60687, First vertex group not selecting properly
Referenced by issue #60651, Adding new workspaces from old startup files fails
Referenced by issue #60642, Cannot animate "Disable object in renders" property
Referenced by issue #60180, Can't select plane objects after changing Display As setting to Wire.
Referenced by issue #58793, Volumetric Clouds in Eevee not working | MacOs
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View 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)

2
build_files/cmake/config/blender_release.cmake
View 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)

2
intern/cycles/render/shader.cpp
View 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;
}

2
intern/numaapi/source/numaapi_win32.c
View 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) {