minor cleanup, no functional changes.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 14:41:44 +0000 (14:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 14:41:44 +0000 (14:41 +0000)
CMakeLists.txt
intern/ghost/CMakeLists.txt
source/blender/CMakeLists.txt
source/blender/blenfont/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/include/ED_image.h
source/blender/editors/render/CMakeLists.txt
source/blender/gpu/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/python/intern/bpy_operator_wrap.c
source/creator/CMakeLists.txt

index a3baf582b9f36a1fafca89141d65e49db435bf4c..03f62a075632d7d55c4f07154e716bbae9e41d93 100644 (file)
@@ -870,7 +870,7 @@ elseif(APPLE)
                set(GETTEXT_LIB intl iconv)
                set(GETTEXT_LIBPATH ${GETTEXT}/lib)
        endif()
-  
+
        if(WITH_FFTW3)
                set(FFTW3 ${LIBDIR}/fftw3)
                set(FFTW3_INC ${FFTW3}/include)
index 0d7a64ddfa9d8224fad11ae30cca378915decd37..d42be400dff511991c2cfba9c0b0a3aa6188e993 100644 (file)
@@ -29,7 +29,7 @@ set(INC
        ../string
        ../../source/blender/imbuf
        ../../source/blender/makesdna
-    ${GLEW_INCLUDE_PATH}
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 263d81fab0a9093052e4d7084281e806926b1493..af1fb3565f67455585939c2663f1f8a816260894 100644 (file)
@@ -123,6 +123,5 @@ if(WITH_PYTHON)
 endif()
 
 if(WITH_OPENCOLLADA)
-  add_subdirectory(collada)
+       add_subdirectory(collada)
 endif()
-
index 15fbfaa2de21c522275bc558e6c4938d3aa8d61f..48ee4aed0337bf38937bf4310323ee5221301282 100644 (file)
@@ -29,7 +29,7 @@ set(INC
        ../editors/include
        ../blenkernel
        ../../../intern/guardedalloc
-    ${GLEW_INCLUDE_PATH}
+       ${GLEW_INCLUDE_PATH}
        ${FREETYPE_INCLUDE_DIRS}
 )
 
index c6df694f61e1c5ac527cf6741a9a387dc90987eb..b7976c404ae879d7c55c9bbfc68e598347240788 100644 (file)
@@ -53,7 +53,7 @@ set(INC
        ../../../intern/opennl/extern
        ../../../intern/smoke/extern
        ../../../intern/mikktspace
-    ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+       ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
        ${GLEW_INCLUDE_PATH}
        ${ZLIB_INCLUDE_DIRS}
 )
@@ -314,7 +314,7 @@ if(WITH_LZMA)
 endif()
 
 if(MSVC)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()
 
 blender_add_lib(bf_blenkernel "${SRC}" "${INC}")
index 2c86649550388b2f22ee132b90c320eab1e64eca..cfe9ea53d9a3197362a4d4228146a0d635c0fb40 100644 (file)
@@ -68,8 +68,5 @@ int ED_space_image_show_uvshadow(struct SpaceImage *sima, struct Object *obedit)
 /* UI level image (texture) updating... render calls own stuff (too) */
 void ED_image_update_frame(const struct Main *mainp, int cfra);
 
-/* image_render.c, export for screen_ops.c, render operator */
-void ED_space_image_output(struct bContext *C);
-
 #endif /* ED_IMAGE_H */
 
index 16cfca8dadb7b526734ac66adf744cf87dc9058f..b8102ba37a1edf38b38f339150def46696d0d5cd 100644 (file)
@@ -32,7 +32,7 @@ set(INC
        ../../render/extern/include
        ../../windowmanager
        ../../../../intern/guardedalloc
-    ${GLEW_INCLUDE_PATH}
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index fc7e34086837d03aac6b220b6d8b0f928b8e11d8..d6e2b56c06595e19f27c1b6d34b9db4db4802150 100644 (file)
@@ -34,7 +34,7 @@ set(INC
        ../makesrna
        ../../../intern/guardedalloc
        ../../../intern/smoke/extern
-    ${GLEW_INCLUDE_PATH}
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 9cafca3532f20b025381caa78f23d1cf7f09673d..350ca9f6bae2b42207c72482c64a3eb477b0f99e 100644 (file)
@@ -222,7 +222,7 @@ blender_include_dirs(
        ../../../../intern/audaspace/intern
        ../../../../intern/guardedalloc
        ../../../../intern/memutil
-    ${GLEW_INCLUDE_PATH}
+       ${GLEW_INCLUDE_PATH}
 )
 
 add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})
index e1ef8aa49c1f4aee91818685fdcae6a40e984d4c..de29cb2aeace6e6d5b5e898f8358ed9b5b92df09 100644 (file)
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  *
index b39393bc8b7d39081279f5315219a96aa70c81f3..d3df5e094c3551decd8d215133aaafcc21c1de2c 100644 (file)
@@ -191,10 +191,10 @@ if(WITH_PYTHON_MODULE)
        set_target_properties(
                blender
                PROPERTIES
-                        PREFIX ""
-                        OUTPUT_NAME bpy
-                        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/
-                        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/  # only needed on windows
+                               PREFIX ""
+                               OUTPUT_NAME bpy
+                               LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/
+                               RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/  # only needed on windows
        )
        
        if(WIN32)
@@ -202,7 +202,7 @@ if(WITH_PYTHON_MODULE)
                set_target_properties(
                        blender
                        PROPERTIES
-                                SUFFIX ".pyd"
+                       SUFFIX ".pyd"
                )       
        endif()
        
@@ -574,19 +574,19 @@ elseif(WIN32)
                endif()
        endif()
 
-    if(NOT CMAKE_CL_64)
+       if(NOT CMAKE_CL_64)
                install(
                        FILES
-               ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
-               DESTINATION ${TARGETDIR}/
-           )
-    else()
+                       ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
+                       DESTINATION ${TARGETDIR}/
+               )
+       else()
                install(
                        FILES
-               ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
-               DESTINATION ${TARGETDIR}/
-           )
-    endif()
+                       ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
+                       DESTINATION ${TARGETDIR}/
+               )
+       endif()
 
 elseif(APPLE)
        set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
@@ -811,13 +811,13 @@ endif()
                bf_intern_mikktspace
        )
 
-    if(WITH_MOD_CLOTH_ELTOPO)
+       if(WITH_MOD_CLOTH_ELTOPO)
                list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
-    endif()
+       endif()
 
-    if(WITH_BUILTIN_GLEW)
+       if(WITH_BUILTIN_GLEW)
                list(APPEND BLENDER_SORTED_LIBS extern_glew)
-    endif()
+       endif()
 
        if(WITH_BINRELOC)
                list(APPEND BLENDER_SORTED_LIBS extern_binreloc)