diff options
| -rw-r--r-- | build_files/cmake/platform/platform_win32_msvc.cmake | 37 | ||||
| -rw-r--r-- | source/blender/depsgraph/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 1 | ||||
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 2 | ||||
| -rw-r--r-- | tests/python/CMakeLists.txt | 8 |
5 files changed, 25 insertions, 24 deletions
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake index 2055b164f6d..3b417f79cbe 100644 --- a/build_files/cmake/platform/platform_win32_msvc.cmake +++ b/build_files/cmake/platform/platform_win32_msvc.cmake @@ -452,20 +452,21 @@ if(WITH_MOD_CLOTH_ELTOPO) endif() if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) - set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include) - set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib) - set(OPENSUBDIV_LIBRARIES optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib - optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib - debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib - debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib - ) - set(OPENSUBDIV_HAS_OPENMP TRUE) + set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include) + set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib) + set(OPENSUBDIV_LIBRARIES + optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib + optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib + debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib + debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib + ) + set(OPENSUBDIV_HAS_OPENMP TRUE) set(OPENSUBDIV_HAS_TBB FALSE) set(OPENSUBDIV_HAS_OPENCL TRUE) set(OPENSUBDIV_HAS_CUDA FALSE) set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE) set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE) - windows_find_package(OpenSubdiv) + windows_find_package(OpenSubdiv) endif() if(WITH_SDL) @@ -488,14 +489,14 @@ endif() # used in many places so include globally, like OpenGL blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}") -#find signtool -SET(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( ) +#find signtool +set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( ) find_program(SIGNTOOL_EXE signtool -HINTS - "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/" - "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/" - "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/" - "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/" - "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/" - "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/" + HINTS + "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/" + "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/" + "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/" + "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/" + "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/" + "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/" ) diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index b664af570b1..33a7628c68d 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -87,6 +87,7 @@ set(SRC intern/depsgraph_intern.h intern/depsgraph_types.h + util/deg_util_foreach.h util/deg_util_function.h ) diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 4b0ba6942e4..174feec0e22 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -533,7 +533,6 @@ static int gp_strokes_paste_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); bGPdata *gpd = ED_gpencil_data_get_active(C); bGPDlayer *gpl = CTX_data_active_gpencil_layer(C); /* only use active for copy merge */ - bGPDpalette *palette = CTX_data_active_gpencil_palette(C); bGPDframe *gpf; eGP_PasteMode type = RNA_enum_get(op->ptr, "type"); diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index a95a99449fd..8139e29bade 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -117,7 +117,7 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, bNode *node, else { sock = BLI_findlink(&node->outputs, sock_index); NodeImageLayer *sockdata = sock->storage; - if(sockdata) { + if (sockdata) { BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name)); } } diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index d3067a22ee7..bd8ecbfce69 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -104,15 +104,15 @@ add_test(bevel ${TEST_BLENDER_EXE} ) add_test(split_faces ${TEST_BLENDER_EXE} - ${TEST_SRC_DIR}/modeling/split_faces_test.blend - --python-text run_tests + ${TEST_SRC_DIR}/modeling/split_faces_test.blend + --python-text run_tests ) # ------------------------------------------------------------------------------ # MODIFIERS TESTS add_test(modifier_array ${TEST_BLENDER_EXE} - ${TEST_SRC_DIR}/modifier_stack/array_test.blend - --python-text run_tests + ${TEST_SRC_DIR}/modifier_stack/array_test.blend + --python-text run_tests ) # ------------------------------------------------------------------------------ |