Cleanup: cmake indentation, missing include
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Jun 2017 20:45:21 +0000 (06:45 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Jun 2017 20:45:21 +0000 (06:45 +1000)
build_files/cmake/platform/platform_win32_msvc.cmake
source/blender/depsgraph/CMakeLists.txt
source/blender/editors/gpencil/gpencil_edit.c
source/blender/nodes/composite/nodes/node_composite_image.c
tests/python/CMakeLists.txt

index 2055b164f6d97f698c2c17f2771b813f410c8956..3b417f79cbe04c933b4098054e608d8727c614aa 100644 (file)
@@ -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/"
 )
index b664af570b1d3f5aee88ed0929008a48cf3ea7b3..33a7628c68d5d741bf8c3172eb15bc97f5fcb60b 100644 (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
 )
 
index 4b0ba6942e45acf7591c12236f965cc07155676f..174feec0e226344cbed635365b1a1ca488334676 100644 (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");
index a95a99449fd166c2204e24a54202b512a04b9b20..8139e29bade2c0a64d2c6fa86dd62361f7fd4b04 100644 (file)
@@ -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));
                }
        }
index d3067a22ee764c1c1309ffb5a6a10822d2530607..bd8ecbfce6922d8a6bde236198cd6edf7e9ccdb0 100644 (file)
@@ -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
 )
 
 # ------------------------------------------------------------------------------