diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-05-04 18:19:25 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-05-04 18:19:25 +0300 |
| commit | 8ff5836766a9ebebe22966f50f6e61bcf20e7602 (patch) | |
| tree | c67828d41e052828e8bc8121098f2784cc7f6af4 | |
| parent | d2271cf939261b2515f3bb075eed03303584ce74 (diff) | |
| parent | b5c3885bf05247cb1ddd4569ff13f55f40752d2f (diff) | |
Merge branch 'blender-v3.2-release'
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_bake_animation.cc | 5 |
3 files changed, 5 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 06e9fba4aa9..f5660b3653b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -486,7 +486,7 @@ if((UNIX AND NOT APPLE) OR (CMAKE_GENERATOR MATCHES "^Visual Studio.+")) endif() option(WITH_BOOST "Enable features depending on boost" ON) -option(WITH_TBB "Enable features depending on TBB (OpenVDB, OpenImageDenoise, sculpt multithreading)" ON) +option(WITH_TBB "Enable multithreading. TBB is also required for features such as Cycles, OpenVDB and USD" ON) # TBB malloc is only supported on for windows currently if(WIN32) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index e33330af029..d97854a52d0 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -356,16 +356,13 @@ if(WITH_CYCLES_CUDA_BINARIES) set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") # warn for other versions - if((CUDA_VERSION MATCHES "101") OR - (CUDA_VERSION MATCHES "102") OR - (CUDA_VERSION MATCHES "111") OR - (CUDA_VERSION MATCHES "112") OR - (CUDA_VERSION MATCHES "113") OR - (CUDA_VERSION MATCHES "114")) + if((CUDA_VERSION STREQUAL "101") OR + (CUDA_VERSION STREQUAL "102") OR + (CUDA_VERSION_MAJOR STREQUAL "11")) else() message(WARNING "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, " - "build may succeed but only CUDA 10.1 to 11.4 are officially supported") + "build may succeed but only CUDA 11, 10.2 and 10.1 have been tested") endif() # build for each arch diff --git a/source/blender/editors/gpencil/gpencil_bake_animation.cc b/source/blender/editors/gpencil/gpencil_bake_animation.cc index 0667da46e25..dfc74f6d225 100644 --- a/source/blender/editors/gpencil/gpencil_bake_animation.cc +++ b/source/blender/editors/gpencil/gpencil_bake_animation.cc @@ -283,10 +283,6 @@ static int gpencil_bake_grease_pencil_animation_exec(bContext *C, wmOperator *op } MEM_freeN(layer_name); - /* Layer Transform matrix. */ - float matrix[4][4]; - BKE_gpencil_layer_transform_matrix_get(depsgraph, elem->ob, gpl_src, matrix); - /* Apply time modifier. */ int remap_cfra = BKE_gpencil_time_modifier_cfra( depsgraph, scene, elem->ob, gpl_src, CFRA, false); @@ -324,7 +320,6 @@ static int gpencil_bake_grease_pencil_animation_exec(bContext *C, wmOperator *op /* Update point location to new object space. */ for (int j = 0; j < gps->totpoints; j++) { bGPDspoint *pt = &gps->points[j]; - mul_m4_v3(matrix, &pt->x); mul_m4_v3(invmat, &pt->x); } |