Cleanup: cmake indentation, missing include

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

View File

@@ -454,7 +454,8 @@ 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
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
@@ -489,7 +490,7 @@ endif()
blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
#find signtool
SET(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
find_program(SIGNTOOL_EXE signtool
HINTS
"$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"

View File

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

View File

@@ -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");