Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: cmake indentation, missing include

Browse Source
This commit is contained in:
Campbell Barton
2017-06-09 06:45:21 +10:00
parent c71e160c02
commit 46c073e4ac
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
build_files/cmake/platform/platform_win32_msvc.cmake
View File

@@ -452,20 +452,21 @@ if(WITH_MOD_CLOTH_ELTOPO)
endif() endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include) set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib) set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
set(OPENSUBDIV_LIBRARIES optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib set(OPENSUBDIV_LIBRARIES
optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
) debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
set(OPENSUBDIV_HAS_OPENMP TRUE) )
set(OPENSUBDIV_HAS_OPENMP TRUE)
set(OPENSUBDIV_HAS_TBB FALSE) set(OPENSUBDIV_HAS_TBB FALSE)
set(OPENSUBDIV_HAS_OPENCL TRUE) set(OPENSUBDIV_HAS_OPENCL TRUE)
set(OPENSUBDIV_HAS_CUDA FALSE) set(OPENSUBDIV_HAS_CUDA FALSE)
set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE) set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE) set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
windows_find_package(OpenSubdiv) windows_find_package(OpenSubdiv)
endif() endif()
if(WITH_SDL) if(WITH_SDL)
@@ -488,14 +489,14 @@ endif()
# used in many places so include globally, like OpenGL # used in many places so include globally, like OpenGL
blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}") blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
#find signtool #find signtool
SET(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( ) set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
find_program(SIGNTOOL_EXE signtool find_program(SIGNTOOL_EXE signtool
HINTS HINTS
"$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/" "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"
"$ENV{ProgramFiles}/Windows Kits/10/bin/x86/" "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/"
"$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/" "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/"
"$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/" "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/"
"$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/" "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/"
"$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/" "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/"
) )

1
source/blender/depsgraph/CMakeLists.txt
View File

@@ -87,6 +87,7 @@ set(SRC
intern/depsgraph_intern.h intern/depsgraph_intern.h
intern/depsgraph_types.h intern/depsgraph_types.h
util/deg_util_foreach.h
util/deg_util_function.h util/deg_util_function.h
) )

1
source/blender/editors/gpencil/gpencil_edit.c
View File

@@ -533,7 +533,6 @@ static int gp_strokes_paste_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
bGPdata *gpd = ED_gpencil_data_get_active(C); bGPdata *gpd = ED_gpencil_data_get_active(C);
bGPDlayer *gpl = CTX_data_active_gpencil_layer(C); /* only use active for copy merge */ bGPDlayer *gpl = CTX_data_active_gpencil_layer(C); /* only use active for copy merge */
bGPDpalette *palette = CTX_data_active_gpencil_palette(C);
bGPDframe *gpf; bGPDframe *gpf;
eGP_PasteMode type = RNA_enum_get(op->ptr, "type"); eGP_PasteMode type = RNA_enum_get(op->ptr, "type");

2
source/blender/nodes/composite/nodes/node_composite_image.c
View File

@@ -117,7 +117,7 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, bNode *node,
else { else {
sock = BLI_findlink(&node->outputs, sock_index); sock = BLI_findlink(&node->outputs, sock_index);
NodeImageLayer *sockdata = sock->storage; NodeImageLayer *sockdata = sock->storage;
if(sockdata) { if (sockdata) {
BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name)); BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name));
} }
} }

8
tests/python/CMakeLists.txt
View File

@@ -104,15 +104,15 @@ add_test(bevel ${TEST_BLENDER_EXE}
) )
add_test(split_faces ${TEST_BLENDER_EXE} add_test(split_faces ${TEST_BLENDER_EXE}
${TEST_SRC_DIR}/modeling/split_faces_test.blend ${TEST_SRC_DIR}/modeling/split_faces_test.blend
--python-text run_tests --python-text run_tests
) )
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# MODIFIERS TESTS # MODIFIERS TESTS
add_test(modifier_array ${TEST_BLENDER_EXE} add_test(modifier_array ${TEST_BLENDER_EXE}
${TEST_SRC_DIR}/modifier_stack/array_test.blend ${TEST_SRC_DIR}/modifier_stack/array_test.blend
--python-text run_tests --python-text run_tests
) )
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------