Merging r38433 through r38453 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 17 Jul 2011 17:25:11 +0000 (17:25 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 17 Jul 2011 17:25:11 +0000 (17:25 +0000)
86 files changed:
build_files/cmake/cmake_consistency_check.py
extern/binreloc/CMakeLists.txt
extern/glew/CMakeLists.txt
extern/lzo/CMakeLists.txt
intern/audaspace/CMakeLists.txt
intern/boolop/CMakeLists.txt
intern/bsp/CMakeLists.txt
intern/ffmpeg/ffmpeg_compat.h
intern/ghost/CMakeLists.txt
intern/smoke/CMakeLists.txt
release/scripts/templates/batch_export.py [new file with mode: 0644]
source/blender/avi/CMakeLists.txt
source/blender/blenfont/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/collada/CMakeLists.txt
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/curve/CMakeLists.txt
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/metaball/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/object_bake.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sound/CMakeLists.txt
source/blender/editors/space_action/CMakeLists.txt
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_buttons/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/node_header.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sound/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_time/CMakeLists.txt
source/blender/editors/space_userpref/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/gpu/CMakeLists.txt
source/blender/ikplugin/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_object_api.c
source/blender/modifiers/CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/python/generic/CMakeLists.txt
source/blender/python/generic/bgl.c
source/blender/python/intern/CMakeLists.txt
source/blender/quicktime/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/Network/CMakeLists.txt
source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
source/gameengine/Physics/Bullet/CMakeLists.txt
source/gameengine/Rasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
source/gameengine/VideoTexture/CMakeLists.txt

index c13da8775b3d7fd6082d8ee4c85ab5cd1da83fe6..4b35e34a5cddf5bb35d176adc48adc60bcbc2868 100755 (executable)
@@ -35,6 +35,21 @@ global_c = set()
 global_refs = {}
 
 
+def replace_line(f, i, text, keep_indent=True):
+    file_handle = open(f, 'r')
+    data = file_handle.readlines()
+    file_handle.close()
+    
+    l = data[i]
+    ws = l[:len(l) - len(l.lstrip())]
+    
+    data[i] = "%s%s\n" % (ws, text)
+    
+    file_handle = open(f, 'w')
+    file_handle.writelines(data)
+    file_handle.close()
+
+
 def source_list(path, filename_check=None):
     for dirpath, dirnames, filenames in os.walk(path):
 
@@ -77,7 +92,20 @@ def cmake_get_src(f):
     found = False
     i = 0
     # print(f)
+
+    def is_definition(l, f, i, name):
+        if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)):
+            if len(l.split()) > 1:
+                raise Exception("strict formatting not kept 'set(%s*' %s:%d" % (name, f, i))
+            return True
+
+        if ("list(APPEND %s" % name) in l or ('list(APPEND ' in l and l.endswith(name)):
+            if l.endswith(")"):
+                raise Exception("strict formatting not kept 'list(APPEND %s...)' on 1 line %s:%d" % (name, f, i))
+            return True
+
     while it is not None:
+        context_name = ""
         while it is not None:
             i += 1
             try:
@@ -87,16 +115,13 @@ def cmake_get_src(f):
                 break
             l = l.strip()
             if not l.startswith("#"):
-                if 'set(SRC' in l or ('set(' in l and l.endswith("SRC")):
-                    if len(l.split()) > 1:
-                        raise Exception("strict formatting not kept 'set(SRC*' %s:%d" % (f, i))
-                    found = True
+                found = is_definition(l, f, i, "SRC")
+                if found:
+                    context_name = "SRC"
                     break
-
-                if "list(APPEND SRC" in l or ('list(APPEND ' in l and l.endswith("SRC")):
-                    if l.endswith(")"):
-                        raise Exception("strict formatting not kept 'list(APPEND SRC...)' on 1 line %s:%d" % (f, i))
-                    found = True
+                found = is_definition(l, f, i, "INC")
+                if found:
+                    context_name = "INC"
                     break
 
         if found:
@@ -125,30 +150,45 @@ def cmake_get_src(f):
                     if not l:
                         pass
                     elif l.startswith("$"):
-                        # assume if it ends with SRC we know about it
-                        if not l.split("}")[0].endswith("SRC"):
-                            print("Can't use var '%s' %s:%d" % (l, f, i))
+                        if context_name == "SRC":
+                            # assume if it ends with context_name we know about it
+                            if not l.split("}")[0].endswith(context_name):
+                                print("Can't use var '%s' %s:%d" % (l, f, i))
                     elif len(l.split()) > 1:
                         raise Exception("Multi-line define '%s' %s:%d" % (l, f, i))
                     else:
                         new_file = normpath(join(cmake_base, l))
 
-                        if is_c_header(new_file):
-                            sources_h.append(new_file)
-                            global_refs.setdefault(new_file, []).append((f, i))
-                        elif is_c(new_file):
-                            sources_c.append(new_file)
-                            global_refs.setdefault(new_file, []).append((f, i))
-                        elif l in ("PARENT_SCOPE", ):
-                            # cmake var, ignore
-                            pass
-                        elif new_file.endswith(".list"):
-                            pass
-                        elif new_file.endswith(".def"):
-                            pass
-                        else:
-                            raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
-
+                        if context_name == "SRC":
+                            if is_c_header(new_file):
+                                sources_h.append(new_file)
+                                global_refs.setdefault(new_file, []).append((f, i))
+                            elif is_c(new_file):
+                                sources_c.append(new_file)
+                                global_refs.setdefault(new_file, []).append((f, i))
+                            elif l in ("PARENT_SCOPE", ):
+                                # cmake var, ignore
+                                pass
+                            elif new_file.endswith(".list"):
+                                pass
+                            elif new_file.endswith(".def"):
+                                pass
+                            else:
+                                raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
+
+                        elif context_name == "INC":
+                            if os.path.isdir(new_file):
+                                new_path_rel = os.path.relpath(new_file, cmake_base)
+
+                                if new_path_rel != l:
+                                    print("overly relative path:\n  %s:%d\n  %s\n  %s" % (f, i, l, new_path_rel))
+                                    
+                                    ## Save time. just replace the line
+                                    # replace_line(f, i - 1, new_path_rel)
+                                    
+                            else:
+                                raise Exception("non existant include %s:%d -> %s" % (f, i, new_file))
+                            
                         # print(new_file)
 
             global_h.update(set(sources_h))
@@ -166,6 +206,10 @@ def cmake_get_src(f):
                 if ff not in sources_c:
                     print("  missing: " + ff)
             '''
+            
+            # reset
+            sources_h[:] = []
+            sources_c[:] = []
 
     filen.close()
 
index a4f85a2fdfde25656172456994405827275b976a..753e28091d33ea44556648bac73938737de5e735 100644 (file)
@@ -19,7 +19,7 @@
 #
 
 set(INC
-       ./include
+       include
 )
 
 set(INC_SYS
index 35beacab6a335e3f50832ba246b25f223b2ab201..87f8bb6e94096fa8336b67d9770b291186529e70 100644 (file)
@@ -25,7 +25,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ./include
+       include
 )
 
 set(INC_SYS
@@ -33,7 +33,9 @@ set(INC_SYS
 )
 
 if(UNIX)
-       list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+       list(APPEND INC_SYS
+               ${X11_X11_INCLUDE_PATH}
+       )
 endif()
 
 set(SRC
index 10ea2c58f7c3df2761769e29f0f10be16f6e0ca1..11eb18520b622b9a557701fe72d3bd6b36c8f815 100644 (file)
@@ -25,7 +25,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       include
+
 )
 
 set(INC_SYS
index ab88c9ecabd23601efdc48dc7c75f396825592ad..7eef13b103beb9e9cdaa74656bce3bd99a548d08 100644 (file)
@@ -22,9 +22,9 @@
 
 set(INC
        .
-       intern
        FX
        SRC
+       intern
        ../ffmpeg
 )
 
@@ -159,8 +159,12 @@ set(SRC
 
 if(WITH_CODEC_FFMPEG)
        add_definitions(-DWITH_FFMPEG)
-       list(APPEND INC ffmpeg)
-       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC
+               ffmpeg
+       )
+       list(APPEND INC_SYS
+               ${FFMPEG_INCLUDE_DIRS}
+       )
        list(APPEND SRC
                ffmpeg/AUD_FFMPEGFactory.cpp
                ffmpeg/AUD_FFMPEGReader.cpp
@@ -172,8 +176,12 @@ endif()
 
 if(WITH_SDL)
        add_definitions(-DWITH_SDL)
-       list(APPEND INC SDL)
-       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+       list(APPEND INC
+               SDL
+       )
+       list(APPEND INC_SYS
+               ${SDL_INCLUDE_DIR}
+       )
        list(APPEND SRC
                SDL/AUD_SDLDevice.cpp
 
@@ -183,8 +191,12 @@ endif()
 
 if(WITH_OPENAL)
        add_definitions(-DWITH_OPENAL)
-       list(APPEND INC OpenAL)
-       list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR})
+       list(APPEND INC
+               OpenAL
+       )
+       list(APPEND INC_SYS
+               ${OPENAL_INCLUDE_DIR}
+       )
        list(APPEND SRC
                OpenAL/AUD_OpenALDevice.cpp
 
@@ -194,8 +206,12 @@ endif()
 
 if(WITH_JACK)
        add_definitions(-DWITH_JACK)
-       list(APPEND INC jack)
-       list(APPEND INC_SYS ${JACK_INCLUDE_DIRS})
+       list(APPEND INC
+               jack
+       )
+       list(APPEND INC_SYS
+               ${JACK_INCLUDE_DIRS}
+       )
        list(APPEND SRC
                jack/AUD_JackDevice.cpp
 
@@ -205,8 +221,12 @@ endif()
 
 if(WITH_CODEC_SNDFILE)
        add_definitions(-DWITH_SNDFILE)
-       list(APPEND INC sndfile)
-       list(APPEND INC_SYS ${SNDFILE_INCLUDE_DIRS})
+       list(APPEND INC
+               sndfile
+       )
+       list(APPEND INC_SYS
+               ${SNDFILE_INCLUDE_DIRS}
+       )
        list(APPEND SRC
                sndfile/AUD_SndFileFactory.cpp
                sndfile/AUD_SndFileReader.cpp
@@ -218,7 +238,9 @@ endif()
 
 if(WITH_SAMPLERATE)
        add_definitions(-DWITH_SAMPLERATE)
-       list(APPEND INC_SYS ${SAMPLERATE_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${SAMPLERATE_INCLUDE_DIRS}
+       )
        list(APPEND SRC
                SRC/AUD_SRCResampleFactory.cpp
                SRC/AUD_SRCResampleReader.cpp
@@ -230,8 +252,12 @@ endif()
 
 if(WITH_FFTW3 AND FALSE)
        add_definitions(-DWITH_FFTW3)
-       list(APPEND INC fftw)
-       list(APPEND INC_SYS ${FFTW3_INCLUDE_DIRS})
+       list(APPEND INC
+               fftw
+       )
+       list(APPEND INC_SYS
+               ${FFTW3_INCLUDE_DIRS}
+       )
        list(APPEND SRC
                fftw/AUD_BandPassFactory.cpp
                fftw/AUD_BandPassReader.cpp
@@ -242,8 +268,12 @@ if(WITH_FFTW3 AND FALSE)
 endif()
 
 if(WITH_PYTHON)
-       list(APPEND INC Python)
-       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC
+               Python
+       )
+       list(APPEND INC_SYS
+               ${PYTHON_INCLUDE_DIRS}
+       )
        list(APPEND SRC
                Python/AUD_PyAPI.cpp
 
index 7a95d5561723a9ffb1247c2c765b85a569bb1b33..742c0f1d42c4844fb070e169e7e2b4fee82b84df 100644 (file)
 
 set(INC        
        .
-       ./intern
-       ./extern
-       ../memutil
+       extern
+       intern
        ../container
        ../guardedalloc
+       ../memutil
        ../moto/include
        ../../source/blender/blenlib
        ../../source/blender/makesdna
index 792f6aa1327fa6a21df58771e09f4ad17919ac76..a844db3257ed29d127136daf9e4914b0ae13d509 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ./intern
+       intern
        ../container
        ../guardedalloc
-       ../moto/include
        ../memutil
+       ../moto/include
 )
 
 set(INC_SYS
index d8edffbfe0b9d646f7402b8de1701a3d7b19cf5a..fae8590568d78c7e4dcdaaaa4f421925e5fe54f6 100644 (file)
@@ -40,7 +40,7 @@
 #define FFMPEG_HAVE_AVIO 1
 #endif
 
-#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122))
+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 121))
 #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
 #endif
 
index 41c70b7cd169e502f8dd5a3beb024a0f0849b20d..ccd763ef42ce74818c70f6950efbfe80e8ac448c 100644 (file)
@@ -37,9 +37,8 @@ set(INC_SYS
 
 set(SRC
        intern/GHOST_Buttons.cpp
-       intern/GHOST_CallbackEventConsumer.cpp
        intern/GHOST_C-api.cpp
-       intern/GHOST_Path-api.cpp
+       intern/GHOST_CallbackEventConsumer.cpp
        intern/GHOST_DisplayManager.cpp
        intern/GHOST_EventManager.cpp
        intern/GHOST_ISystem.cpp
@@ -47,6 +46,7 @@ set(SRC
        intern/GHOST_ModifierKeys.cpp
        intern/GHOST_NDOFManager.cpp
        intern/GHOST_Path-api.cpp
+       intern/GHOST_Path-api.cpp
        intern/GHOST_Rect.cpp
        intern/GHOST_System.cpp
        intern/GHOST_TimerManager.cpp
@@ -63,6 +63,7 @@ set(SRC
        GHOST_Path-api.h
        GHOST_Rect.h
        GHOST_Types.h
+
        intern/GHOST_Buttons.h
        intern/GHOST_CallbackEventConsumer.h
        intern/GHOST_Debug.h
@@ -146,7 +147,9 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
                )
        endif()
 
-       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+       list(APPEND INC_SYS
+               ${SDL_INCLUDE_DIR}
+       )
 
 elseif(APPLE)
        if(WITH_COCOA)
@@ -185,7 +188,9 @@ elseif(UNIX)
                add_definitions(-DWITH_X11_XINPUT)
        endif()
 
-       list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+       list(APPEND INC_SYS
+               ${X11_X11_INCLUDE_PATH}
+       )
 
        list(APPEND SRC
                intern/GHOST_DisplayManagerX11.cpp
@@ -205,7 +210,9 @@ elseif(UNIX)
 
        if(X11_XF86keysym_INCLUDE_PATH)
                add_definitions(-DWITH_XF86KEYSYM)
-               list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH})
+               list(APPEND INC_SYS
+                       ${X11_XF86keysym_INCLUDE_PATH}
+               )
        endif()
 
 elseif(WIN32)
@@ -213,7 +220,9 @@ elseif(WIN32)
                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
        endif()
 
-       list(APPEND INC_SYS ${WINTAB_INC})
+       list(APPEND INC_SYS
+               ${WINTAB_INC}
+       )
 
        list(APPEND SRC
                intern/GHOST_DisplayManagerWin32.cpp
index 174ee8bc3eda2a98e239868c458ca45d1c7c96ee..094d398a83ce1dfe288b0419b44206c577d5e858 100644 (file)
@@ -89,7 +89,9 @@ endif()
 
 if(WITH_FFTW3)
        add_definitions(-DFFTW3=1)
-       list(APPEND INC ${FFTW3_INCLUDE_DIRS})
+       list(APPEND INC
+               ${FFTW3_INCLUDE_DIRS}
+       )
 endif()
 
 blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/release/scripts/templates/batch_export.py b/release/scripts/templates/batch_export.py
new file mode 100644 (file)
index 0000000..aa0e601
--- /dev/null
@@ -0,0 +1,33 @@
+# exports each selected object into its own file
+
+import bpy
+import os
+
+# export to blend file location
+basedir = os.path.dirname(bpy.data.filepath)
+
+if not basedir:
+    raise Exception("Blend file is not saved")
+
+selection = bpy.context.selected_objects
+
+bpy.ops.object.select_all(action='DESELECT')
+
+for obj in selection:
+
+    obj.select = True
+
+    name = bpy.path.clean_name(obj.name)
+    fn = os.path.join(basedir, name)
+
+    bpy.ops.export_scene.fbx(filepath=fn + ".fbx", use_selection=True)
+
+    ## Can be used for multiple formats
+    # bpy.ops.export_scene.x3d(filepath=fn + ".x3d", use_selection=True)
+
+    obj.select = False
+    
+    print("written:", fn)
+
+for obj in selection:
+    obj.select = True
index bae61fd678b268e45af48dbe0961e6db03cb522f..0fd6435ec4e591155e0fb820b4e9a837a312676a 100644 (file)
@@ -26,8 +26,8 @@
 
 set(INC 
        .
-       ../../../intern/guardedalloc
        ../blenlib
+       ../../../intern/guardedalloc
 )
 
 set(INC_SYS
index b915764c1bb1bb6320d66b1b403a9242fb2f6b93..82099d4f125a9687d0d16f394da03919d91042fb 100644 (file)
 
 set(INC
        .
+       ../blenkernel
        ../blenlib
-       ../makesdna
        ../editors/include
-       ../blenkernel
+       ../makesdna
        ../../../intern/guardedalloc
 )
 
@@ -50,7 +50,9 @@ set(SRC
 )
 
 if(WITH_INTERNATIONAL)
-       list(APPEND INC_SYS ${GETTEXT_INC})
+       list(APPEND INC_SYS
+               ${GETTEXT_INC}
+       )
        add_definitions(-DINTERNATIONAL)
 endif()
 
index 9d6cc52370fb3e4c6fc2df58ea362523b0149fc4..27ba5d6530c75946b9f8963c64251483775afbf0 100644 (file)
@@ -32,8 +32,10 @@ endif()
 set(INC 
        .
        ../avi
+       ../blenfont
        ../blenlib
        ../blenloader
+       ../editors/include
        ../gpu
        ../ikplugin
        ../imbuf
@@ -41,18 +43,19 @@ set(INC
        ../makesrna
        ../modifiers
        ../nodes
-       ../editors/include
        ../render/extern/include
-       ../../../intern/bsp/extern ../blenfont
+       ../../../intern/bsp/extern
        ../../../intern/decimation/extern
        ../../../intern/elbeem/extern
        ../../../intern/guardedalloc
        ../../../intern/iksolver/extern
        ../../../intern/memutil
+       ../../../intern/mikktspace
        ../../../intern/opennl/extern
        ../../../intern/smoke/extern
-       ../../../intern/mikktspace
-       ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+
+       # XXX - BAD LEVEL CALL WM_api.h
+       ../windowmanager
 )
 
 set(INC_SYS
@@ -249,12 +252,16 @@ if(WITH_AUDASPACE)
 endif()
 
 if(WITH_BULLET)
-       list(APPEND INC ../../../extern/bullet2/src)
+       list(APPEND INC
+               ../../../extern/bullet2/src
+       )
        add_definitions(-DUSE_BULLET)
 endif()
 
 if(WITH_MOD_CLOTH_ELTOPO)
-       list(APPEND INC ../../../extern/eltopo)
+       list(APPEND INC
+               ../../../extern/eltopo
+       )
        add_definitions(-DWITH_ELTOPO)
 endif()
 
@@ -283,20 +290,32 @@ if(WITH_IMAGE_HDR)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC
+               ../quicktime
+       )
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ../../../intern/ffmpeg)
-       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC
+               ../../../intern/ffmpeg
+       )
+       list(APPEND INC_SYS
+               ${FFMPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-       list(APPEND INC ../python)
-       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC
+               ../python
+       )
+       list(APPEND INC_SYS
+               ${PYTHON_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_PYTHON)
 
        if(WITH_PYTHON_SECURITY)
@@ -321,12 +340,16 @@ if(WITH_JACK)
 endif()
 
 if(WITH_LZO)
-       list(APPEND INC_SYS ../../../extern/lzo/minilzo)
+       list(APPEND INC_SYS
+               ../../../extern/lzo/minilzo
+       )
        add_definitions(-DWITH_LZO)
 endif()
 
 if(WITH_LZMA)
-       list(APPEND INC_SYS ../../../extern/lzma)
+       list(APPEND INC_SYS
+               ../../../extern/lzma
+       )
        add_definitions(-DWITH_LZMA)
 endif()
 
index 2e05ac7892b39bcc13d4ba4050c41de735363066..b4fc983008ca82b4a5222ae25c825498533407d8 100644 (file)
 
 set(INC 
        .
-       ../makesdna
        ../blenkernel
        ../blenloader
        ../gpu
+       ../makesdna
        ../../../intern/ghost
        ../../../intern/guardedalloc
 )
@@ -138,7 +138,9 @@ set(SRC
 )
 
 if(WITH_BINRELOC)
-       list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}")
+       list(APPEND INC_SYS
+               ${BINRELOC_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_BINRELOC)
 endif()
 
index 312a6546e22c6736a39bf09c224fad3054eeb39d..be15b191c8a236f4c064e833ac0d509a35527452 100644 (file)
@@ -26,8 +26,8 @@
 
 set(INC 
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../makesdna
        ../makesrna
        ../render/extern/include
index a5af15d7f550204fe4283ac620ec2ff3be187347..9d398291b858a8abbc27ce1c907d3b9c5ac7a274 100644 (file)
@@ -28,9 +28,9 @@ set(INC
        .
        ..
        ../blenlib
+       ../blenloader
        ../imbuf
        ../makesdna
-       ../blenloader
        ../../../intern/guardedalloc
 )
 
@@ -50,7 +50,9 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
index 07da532146f03b40a9ed1547ecbe842899a62c09..e2a68d196822bbb7bd9ca2b6f8aedf74679ebb75 100644 (file)
@@ -28,13 +28,13 @@ remove_strict_flags()
 
 set(INC
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
-       ../windowmanager
+       ../editors/include
        ../makesdna
        ../makesrna
-       ../editors/include
+       ../windowmanager
        ../../../intern/guardedalloc
 )
 
index a3c1d035d9b4bdb49117f7de9541e86234246e54..83fe91d6f76ab0f81dbbf2d438686b9acfbec5cb 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 2db6e2784604f560cdfba5f133d4b4c4fb0970f5..9a44525611acbdd34d3d36cca92212eb5799444a 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index dfc7e336e84fee5a182f6781f785bc5eb809c917..9bad02eca1fef6512a8f17c79b82faeba42725c5 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 352960d285a9ace070a040f4ff4d03348994bf58..7a2f196fd6d314df5469d11e97a71264de057296 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 6dd7af70e33589fd107bedbc76505e82cda5b1bf..cc4c1eaa21cdf2a1f681e8bd931ba135b93dc64e 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../imbuf
        ../../makesdna
index bd8789b9eeff291748818e2c949622d02681ca82..02a25a2a122740896449461eb9a8f17a585379e0 100644 (file)
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index 690a8ec2fcb99c79b783986b1cc237f11b86b961..76561b121835981455911bb30e098c3a3a606282 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../render/extern/include
index 4d50b78b7a1b8a579241110f7e3650f8a71405fb..14b40d55f11ad4095e06fdb039803276b50c5cfd 100644 (file)
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../ikplugin
        ../../imbuf
        ../../makesdna
        ../../makesrna
        ../../python
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index 57f6c9de88ee2a32c1441908cb65584b81a234ea..bdd911d68ee2ae8f473fefef62793e4a1effb9e6 100644 (file)
@@ -966,9 +966,10 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l
        MultiresModifierData *mmd= get_multires_modifier(scene, ob, 0);
        Mesh *me= (Mesh*)ob->data;
 
-       *lvl= mmd->lvl;
+       if(ob->mode==OB_MODE_SCULPT) *lvl= mmd->sculptlvl;
+       else *lvl= mmd->lvl;
 
-       if(mmd->lvl==0) {
+       if(*lvl==0) {
                DerivedMesh *tmp_dm= CDDM_from_mesh(me, ob);
                dm= CDDM_copy(tmp_dm);
                tmp_dm->release(tmp_dm);
@@ -976,7 +977,7 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l
                MultiresModifierData tmp_mmd= *mmd;
                DerivedMesh *cddm= CDDM_from_mesh(me, ob);
 
-               tmp_mmd.lvl= mmd->lvl;
+               tmp_mmd.lvl= *lvl;
                dm= multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0, 0);
                cddm->release(cddm);
        }
index 1badccffe3b8c5982b39c1ace47fe8e34aa1b567..f32b23cd3ee82927212fa2bc7577867d516a774f 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 7e497200710cfb61254329f06eaa90dce7c7b1eb..cf6c4290ee0aec8ae8105d71866c14cde2fda96f 100644 (file)
@@ -51,8 +51,12 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../../quicktime)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC
+               ../../quicktime
+       )
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
index 54341257692d6b5236fddd7eabd434398be9aedb..4282110901b91cb392c165619109a1569f6970d9 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 6ecbc9c5eecdd02e9ac977522dbdfd794d5812d6..94e08a020f64b89ee71985b8fd267a8998e58574 100644 (file)
 set(INC
        ../include
        ../../blenkernel
+       ../../blenlib
        ../../blenloader
-       ../../imbuf
        ../../gpu
-       ../../blenlib
+       ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index 55af283b5ded6e54d448da90342f23db252deea8..f66288812ad72c91cf7e23f78134d9c83e19a399 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 6789556aa2b0a9be71861ae8e7e7c59997827c6c..edebaa8273a347d62a8c8a498365d657071b0335 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index c2dc2582c82e701f5238a71f4a3ba16e660319ca..4cbb290be765393a08dfd8999fec65373f724bd9 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 0a4f251e46f4cb51b0ddfaedd8b4068c01db7c11..631e2adea34fd06db8e8562cb3e02735d963055e 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index afa746ea359cfad117b061ff0403d7afbbcdd9a2..4aa6cdbcf2fb373d9e3e0915d7523dab03c3ee82 100644 (file)
@@ -28,8 +28,8 @@ set(INC
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index b7cde90546c5f6cbb69ea6988fad42c69c237750..80205ad556456759e003c0cae734dd4c000b0207 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 7c2d7ffb47bfb948dd3566f50caaa5b91e641ee3..0d4408faf49dc966bdc6249891c3a2f08085941b 100644 (file)
@@ -23,13 +23,13 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 
index c6ed1b7bac76cfb58cfc0a6711fd14048fb2e215..22347df93a32ee158d758b9417799cf9bc0907bd 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index cd24cb5e5d00fe9ecf1ff3ff866ee471ad19c58e..4447190204070019bd0a87c3c1619527caa9ecde 100644 (file)
 
 set(INC
        ../include
+       ../interface
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
-       ../../editors/interface
        ../../../../intern/guardedalloc
 )
 
index 1bf04f4dc376ec9a8050552b4d08a71168ae9ef6..b05d157365d27343b14ae7c954854ed7e3fdf6ff 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 9172bc4e9eb34d8ac3f8ad3d9876495d1dd08f26..dcd6bcd34035451e807140a681392303655bbecf 100644 (file)
@@ -23,14 +23,14 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
        ../../nodes
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
 )
index a982f4b19940d1ac7891cf8698c4f3dc075a73f6..4f3991e8ff868299af250fff85fd80503e37e1b2 100644 (file)
@@ -94,8 +94,6 @@ static void do_node_add(bContext *C, void *UNUSED(arg), int event)
                if(node->flag & NODE_TEST) node->flag |= NODE_SELECT;
        }
        
-       snode_autoconnect(snode, 1, 0);
-       
        /* deselect after autoconnection */
        for(node= snode->edittree->nodes.first; node; node= node->next) {
                if(node->flag & NODE_TEST) node->flag &= ~NODE_SELECT;
index 029c55d08513aa085c29b5c6f4135a18200fd43b..3c5f4a163a28d2f7744ea6a623c6cdaca9d6e467 100644 (file)
@@ -228,6 +228,13 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
                        else if (wmn->action == NA_SELECTED)
                                ED_area_tag_redraw(sa);
                        break;
+               case NC_SCREEN:
+                       switch(wmn->data) {
+                               case ND_ANIMPLAY:
+                                       ED_area_tag_refresh(sa);
+                                       break;
+                       }
+                       break;
 
                case NC_IMAGE:
                        if (wmn->action == NA_EDITED) {
index c05350c256fa43835c917c35c94bd1e8e749a73a..4194d463e103ec97917c6537acf81f58db0fcbb7 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 1aed177eed1a289e67bd59b783781d03675acad4..9d3bd4a67aaa50c0fc71d880689a544f84ddb8bc 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
@@ -44,8 +44,12 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-       list(APPEND INC ../../python)
-       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC
+               ../../python
+       )
+       list(APPEND INC_SYS
+               ${PYTHON_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_PYTHON)
 endif()
 
index 71a4cfca8688ac21b59683dc01044a652a5593bb..9ce5f8e5279cfdceee82504469552df33575d4f7 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 367d07c0c0bd4523a10350ad5b3169ba6b18f20b..870065966ccc6539e9377be209c2791d6f50580a 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 0c174225a58f5760c8b5bb13714c62f704fa5b74..acf00d205a60bda5f66362fad3b8b90dd05894e1 100644 (file)
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
@@ -46,8 +46,12 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-       list(APPEND INC ../../python)
-       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC
+               ../../python
+       )
+       list(APPEND INC_SYS
+               ${PYTHON_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_PYTHON)
 endif()
 
index 79081c7cfd4d34e896ff9bc5120e49e0711af9a7..758d1e629f94385bc548baee8f78078ae83ff321 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 656a5d2f0effccf14958820eaae15badfab20b08..43ac90dce945f25910e49450349694ba16e933ed 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 0a12a28af8d37fe5f06ed6c7dbab49dbf93e098c..c6e936606c86b3af661a460080c619e463ba9b44 100644 (file)
@@ -23,14 +23,14 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/smoke/extern
 )
@@ -61,7 +61,9 @@ set(SRC
 )
 
 if(WITH_GAMEENGINE)
-       list(APPEND INC ../../../../source/gameengine/BlenderRoutines)
+       list(APPEND INC
+               ../../../gameengine/BlenderRoutines
+       )
        add_definitions(-DWITH_GAMEENGINE)
 endif()
 
index 8eb8d538396d01771781bd7ed185b0fe611f2620..283b09f42e4fcd11dfdbab42e32ab28b9b37cde1 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 4c39173f847e05ce5038dc62715d0a431754f32c..719f77db3872df43fd8bc188d37ca705a0ed3a49 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 11e1703d84c465ffb1162545a8e347594c0e68e6..552e1b60154ce4a49cf46f409d9643bd706cc6fe 100644 (file)
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 76e347270bac93da033e7aae153bf494d895e455..8f575dfb50bf2f910bef75ad2143bc72b25cc1eb 100644 (file)
@@ -26,8 +26,8 @@
 
 set(INC
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
        ../imbuf
        ../makesdna
index c2ae31065afac59afa96c176411ce73e2e6b6226..d40a87b4e03f0ea718ca60d499570986021f525e 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
+       .
+       ../blenkernel
        ../blenlib
        ../makesdna
-       ../blenkernel
-       ../ikplugin
        ../../../intern/guardedalloc
        ../../../intern/iksolver/extern
 )
index c9a8f62a197caf481766444db53ee1a1e1e7513d..18b5eff5c7358e47fcdbe74db49e2dda00a165ce 100644 (file)
@@ -32,12 +32,12 @@ endif()
 set(INC 
        .
        ../avi
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
        ../makesdna
-       ../../../intern/memutil
        ../../../intern/guardedalloc
+       ../../../intern/memutil
 )
 
 set(INC_SYS
@@ -113,29 +113,43 @@ if(WITH_IMAGE_OPENEXR)
 endif()
 
 if(WITH_IMAGE_TIFF)
-       list(APPEND INC_SYS ${TIFF_INCLUDE_DIR})
+       list(APPEND INC_SYS
+               ${TIFF_INCLUDE_DIR}
+       )
        add_definitions(-DWITH_TIFF)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-       list(APPEND INC_SYS ${OPENJPEG_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${OPENJPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_OPENJPEG)
 endif()
 
 if(WITH_IMAGE_REDCODE)
-       list(APPEND INC_SYS ${REDCODE_INC})
+       list(APPEND INC_SYS
+               ${REDCODE_INC}
+       )
        add_definitions(-DWITH_REDCODE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC
+               ../quicktime
+       )
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ../../../intern/ffmpeg)
-       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC
+               ../../../intern/ffmpeg
+       )
+       list(APPEND INC_SYS
+               ${FFMPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_FFMPEG)
 endif()
 
index 079f34af773af0830db75a4835f36d126a34decc..4f7f20beecf22dc619cba12c053559501bd1d6a9 100644 (file)
@@ -29,8 +29,8 @@ set(INC
        ..
        ../..
        ../../../blenkernel
-       ../../../blenloader
        ../../../blenlib
+       ../../../blenloader
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )
index fd2b94547b4d467fe070140f85b3047bc84ca81d..53822b830f732a7f5fd5f08fc7e3943ecec8af71 100644 (file)
@@ -28,9 +28,8 @@ set(INC
        .
        ..
        ../..
-       intern/include
-       ../../../blenlib
        ../../../blenkernel
+       ../../../blenlib
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )
index 9ca4dff5bc851917692dbae7d324c06e87856072..3be5219ae444e0779b1e101af4eafcdc56f719a1 100644 (file)
@@ -30,9 +30,8 @@ set(INC
        ../..
        ../../../blenkernel
        ../../../blenlib
-       intern/include
-       ../../../../../intern/guardedalloc
        ../../../makesdna
+       ../../../../../intern/guardedalloc
 )
 
 set(INC_SYS
@@ -44,7 +43,9 @@ set(SRC
 )
 
 if(WITH_IMAGE_OPENEXR)
-       list(APPEND INC_SYS ${OPENEXR_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${OPENEXR_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_OPENEXR)
 endif()
 
index 275b7afd3894ec1fdb7064a9983c411d5bdce4e8..db4af4c637c75b99c56c43703fd815a75f022bfa 100644 (file)
@@ -178,12 +178,16 @@ if(WITH_AUDASPACE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../../quicktime)
+       list(APPEND INC
+               ../../quicktime
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${FFMPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_FFMPEG)
 endif()
 
index d6af04f24750d20a43088c7b197fd2442b2049cd..b33935b7bedeba1dc3531ddfcaa332714934bb79 100644 (file)
@@ -415,6 +415,41 @@ void rna_Object_ray_cast(Object *ob, ReportList *reports, float ray_start[3], fl
        *index= -1;
 }
 
+void rna_Object_closest_point_on_mesh(Object *ob, ReportList *reports, float point_co[3], float n_location[3], float n_normal[3], int *index)
+{
+       BVHTreeFromMesh treeData= {NULL};
+       
+       if(ob->derivedFinal==NULL) {
+               BKE_reportf(reports, RPT_ERROR, "object \"%s\" has no mesh data to be used for finding nearest point.", ob->id.name+2);
+               return;
+       }
+
+       /* no need to managing allocation or freeing of the BVH data. this is generated and freed as needed */
+       bvhtree_from_mesh_faces(&treeData, ob->derivedFinal, 0.0f, 4, 6);
+
+       if(treeData.tree==NULL) {
+               BKE_reportf(reports, RPT_ERROR, "object \"%s\" could not create internal data for finding nearest point", ob->id.name+2);
+               return;
+       }
+       else {
+               BVHTreeNearest nearest;
+
+               nearest.index = -1;
+               nearest.dist = FLT_MAX;
+
+               if(BLI_bvhtree_find_nearest(treeData.tree, point_co, &nearest, treeData.nearest_callback, &treeData) != -1) {
+                       copy_v3_v3(n_location, nearest.co);
+                       copy_v3_v3(n_normal, nearest.no);
+                       *index= nearest.index;
+                       return;
+               }
+       }
+
+       zero_v3(n_location);
+       zero_v3(n_normal);
+       *index= -1;
+}
+
 /* ObjectBase */
 
 void rna_ObjectBase_layers_from_view(Base *base, View3D *v3d)
@@ -501,6 +536,26 @@ void RNA_api_object(StructRNA *srna)
        parm= RNA_def_int(func, "index", 0, 0, 0, "", "The face index, -1 when no intersection is found.", 0, 0);
        RNA_def_function_output(func, parm);
 
+       /* Nearest Point */
+       func= RNA_def_function(srna, "closest_point_on_mesh", "rna_Object_closest_point_on_mesh");
+       RNA_def_function_ui_description(func, "Find the nearest point on the object.");
+       RNA_def_function_flag(func, FUNC_USE_REPORTS);
+
+       /* ray start and end */
+       parm= RNA_def_float_vector(func, "point", 3, NULL, -FLT_MAX, FLT_MAX, "", "", -1e4, 1e4);
+       RNA_def_property_flag(parm, PROP_REQUIRED);
+
+       /* return location and normal */
+       parm= RNA_def_float_vector(func, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "The location on the object closest to the point", -1e4, 1e4);
+       RNA_def_property_flag(parm, PROP_THICK_WRAP);
+       RNA_def_function_output(func, parm);
+       parm= RNA_def_float_vector(func, "normal", 3, NULL, -FLT_MAX, FLT_MAX, "Normal", "The face normal at the closest point", -1e4, 1e4);
+       RNA_def_property_flag(parm, PROP_THICK_WRAP);
+       RNA_def_function_output(func, parm);
+
+       parm= RNA_def_int(func, "index", 0, 0, 0, "", "The face index, -1 when no intersection is found.", 0, 0);
+       RNA_def_function_output(func, parm);
+
        /* View */
        func= RNA_def_function(srna, "is_visible", "rna_Object_is_visible");
        RNA_def_function_ui_description(func, "Determine if object is visible in a given scene.");
index 348e2a0ec1d05f44c5971ae11daca48fb4aefd63..d1f153265acfdbfc295f7b99cb381c9380cb319a 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-       . ./intern
+       .
+       intern
+       ../blenkernel
+       ../blenkernel/intern
        ../blenlib
        ../blenloader
        ../makesdna
-       ../blenkernel
-       ../blenkernel/intern
        ../render/extern/include
-       ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
+       ../../../intern/guardedalloc
 )
 
 set(INC_SYS
@@ -98,7 +99,9 @@ endif()
 
 if(WITH_MOD_DECIMATE)
        add_definitions(-DWITH_MOD_DECIMATE)
-       list(APPEND INC ../../../intern/decimation/extern)
+       list(APPEND INC
+               ../../../intern/decimation/extern
+       )
 endif()
 
 if(NOT WITH_MOD_FLUID)
index d2b58d6111268560532ecfde980df4c5da594074..c3bd37c18ee3702a1ef23e8c4105a59fe330adcc 100644 (file)
@@ -152,8 +152,12 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-       list(APPEND INC ../python)
-       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC
+               ../python
+       )
+       list(APPEND INC_SYS
+               ${PYTHON_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_PYTHON)
 endif()
 
index 794b31b4ed3937f33ca91f036a8c7f6ae2d2fcb2..8dfbf4769957395d50756b3a3d79e503b7b4abb5 100644 (file)
 
 set(INC 
        .
-       ../../blenlib
-       ../../makesdna
        ../../blenkernel
+       ../../blenlib
        ../../blenloader
+       ../../makesdna
        ../../../../intern/guardedalloc
 )
 
index 18d01f450150a73fda06f59eb5e5b845e7c2d9de..603f9f31743a8c875d9db49a0908e91b995ca5e4 100644 (file)
@@ -48,12 +48,15 @@ static PyObject *Buffer_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
 
 /* Buffer sequence methods */
 
-static int Buffer_len(PyObject *self);
-static PyObject *Buffer_item(PyObject *self, int i);
-static PyObject *Buffer_slice(PyObject *self, int begin, int end);
-static int Buffer_ass_item(PyObject *self, int i, PyObject *v);
-static int Buffer_ass_slice(PyObject *self, int begin, int end,
+static int Buffer_len(Buffer *self);
+static PyObject *Buffer_item(Buffer *self, int i);
+static PyObject *Buffer_slice(Buffer *self, int begin, int end);
+static int Buffer_ass_item(Buffer *self, int i, PyObject *v);
+static int Buffer_ass_slice(Buffer *self, int begin, int end,
                             PyObject *seq);
+static PyObject *Buffer_subscript(Buffer *self, PyObject *item);
+static int Buffer_ass_subscript(Buffer *self, PyObject *item,
+                                PyObject *value);
 
 static PySequenceMethods Buffer_SeqMethods = {
        (lenfunc) Buffer_len,                                           /*sq_length */
@@ -68,12 +71,19 @@ static PySequenceMethods Buffer_SeqMethods = {
        (ssizeargfunc) NULL,                                            /* sq_inplace_repeat */
 };
 
-static void Buffer_dealloc(PyObject *self);
-static PyObject *Buffer_repr(PyObject *self);
 
-static PyObject *Buffer_to_list(PyObject *self)
+static PyMappingMethods Buffer_AsMapping = {
+       (lenfunc)Buffer_len,
+       (binaryfunc)Buffer_subscript,
+       (objobjargproc)Buffer_ass_subscript
+};
+
+static void Buffer_dealloc(Buffer *self);
+static PyObject *Buffer_repr(Buffer *self);
+
+static PyObject *Buffer_to_list(Buffer *self)
 {
-       int i, len= ((Buffer *)self)->dimensions[0];
+       int i, len= self->dimensions[0];
        PyObject *list= PyList_New(len);
 
        for (i=0; i<len; i++) {
@@ -83,26 +93,54 @@ static PyObject *Buffer_to_list(PyObject *self)
        return list;
 }
 
-static PyObject *Buffer_dimensions(PyObject *self, void *UNUSED(arg))
+static PyObject *Buffer_to_list_recursive(Buffer *self)
+{
+       PyObject *list;
+
+       if(self->ndimensions > 1) {
+               int i, len= self->dimensions[0];
+               list= PyList_New(len);
+
+               for (i=0; i<len; i++) {
+                       Buffer *sub= (Buffer *)Buffer_item(self, i);
+                       PyList_SET_ITEM(list, i, Buffer_to_list_recursive(sub));
+                       Py_DECREF(sub);
+               }
+       }
+       else {
+               list= Buffer_to_list(self);
+       }
+
+       return list;
+}
+
+/* deprecate */
+static PyObject *Buffer_list(Buffer *self, void *UNUSED(arg))
 {
-       Buffer *buffer= (Buffer *) self;
-       PyObject *list= PyList_New(buffer->ndimensions);
+       fprintf(stderr, "Warning: 'Buffer.list' deprecated, use '[:]' instead\n");
+       return Buffer_to_list(self);
+}
+
+static PyObject *Buffer_dimensions(Buffer *self, void *UNUSED(arg))
+{
+       PyObject *list= PyList_New(self->ndimensions);
        int i;
 
-       for (i= 0; i<buffer->ndimensions; i++) {
-               PyList_SET_ITEM(list, i, PyLong_FromLong(buffer->dimensions[i]));
+       for (i= 0; i<self->ndimensions; i++) {
+               PyList_SET_ITEM(list, i, PyLong_FromLong(self->dimensions[i]));
        }
 
        return list;
 }
 
 static PyMethodDef Buffer_methods[] = {
-       {"to_list", (PyCFunction)Buffer_to_list, METH_NOARGS,
+       {"to_list", (PyCFunction)Buffer_to_list_recursive, METH_NOARGS,
      "return the buffer as a list"},
        {NULL, NULL, 0, NULL}
 };
 
 static PyGetSetDef Buffer_getseters[] = {
+       {(char *)"list", (getter)Buffer_list, NULL, NULL, NULL},
        {(char *)"dimensions", (getter)Buffer_dimensions, NULL, NULL, NULL},
         {NULL, NULL, NULL, NULL, NULL}
 };
@@ -121,7 +159,7 @@ PyTypeObject BGL_bufferType = {
        (reprfunc) Buffer_repr, /*tp_repr */
        NULL,                   /*tp_as_number */
        &Buffer_SeqMethods,     /*tp_as_sequence */
-       NULL,           /* PyMappingMethods *tp_as_mapping; */
+       &Buffer_AsMapping,              /* PyMappingMethods *tp_as_mapping; */
 
        /* More standard operations (here for binary compatibility) */
 
@@ -262,7 +300,8 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject
        int ndimensions = 0;
 
        if(kwds && PyDict_Size(kwds)) {
-               PyErr_SetString(PyExc_TypeError, "bgl.Buffer(): takes no keyword args");
+               PyErr_SetString(PyExc_TypeError,
+                               "bgl.Buffer(): takes no keyword args");
                return NULL;
        }
 
@@ -319,7 +358,7 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject
        
        buffer= BGL_MakeBuffer(type, ndimensions, dimensions, NULL);
        if (init && ndimensions) {
-               if (Buffer_ass_slice((PyObject *) buffer, 0, dimensions[0], init)) {
+               if (Buffer_ass_slice(buffer, 0, dimensions[0], init)) {
                        Py_DECREF(buffer);
                        return NULL;
                }
@@ -330,51 +369,48 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject
 
 /*@ Buffer sequence methods */
 
-static int Buffer_len(PyObject *self)
+static int Buffer_len(Buffer *self)
 {
-       Buffer *buf= (Buffer *) self;
-       return buf->dimensions[0];
+       return self->dimensions[0];
 }
 
-static PyObject *Buffer_item(PyObject *self, int i)
+static PyObject *Buffer_item(Buffer *self, int i)
 {
-       Buffer *buf= (Buffer *) self;
-
-       if (i >= buf->dimensions[0]) {
+       if (i >= self->dimensions[0] || i < 0) {
                PyErr_SetString(PyExc_IndexError, "array index out of range");
                return NULL;
        }
 
-       if (buf->ndimensions==1) {
-               switch (buf->type) {
-                       case GL_BYTE: return Py_BuildValue("b", buf->buf.asbyte[i]);
-                       case GL_SHORT: return Py_BuildValue("h", buf->buf.asshort[i]);
-                       case GL_INT: return Py_BuildValue("i", buf->buf.asint[i]);
-                       case GL_FLOAT: return PyFloat_FromDouble(buf->buf.asfloat[i]);
-                       case GL_DOUBLE: return Py_BuildValue("d", buf->buf.asdouble[i]);
+       if (self->ndimensions==1) {
+               switch (self->type) {
+                       case GL_BYTE: return Py_BuildValue("b", self->buf.asbyte[i]);
+                       case GL_SHORT: return Py_BuildValue("h", self->buf.asshort[i]);
+                       case GL_INT: return Py_BuildValue("i", self->buf.asint[i]);
+                       case GL_FLOAT: return PyFloat_FromDouble(self->buf.asfloat[i]);
+                       case GL_DOUBLE: return Py_BuildValue("d", self->buf.asdouble[i]);
                }
        }
        else {
                Buffer *newbuf;
                int j, length, size;
+
                length= 1;
-               for (j=1; j<buf->ndimensions; j++) {
-                       length*= buf->dimensions[j];
+               for (j=1; j < self->ndimensions; j++) {
+                       length *= self->dimensions[j];
                }
-               size= BGL_typeSize(buf->type);
+               size= BGL_typeSize(self->type);
 
                newbuf= (Buffer *) PyObject_NEW(Buffer, &BGL_bufferType);
 
                Py_INCREF(self);
-               newbuf->parent= self;
+               newbuf->parent= (PyObject *)self;
 
-               newbuf->ndimensions= buf->ndimensions-1;
-               newbuf->type= buf->type;
-               newbuf->buf.asvoid= buf->buf.asbyte + i*length*size;
+               newbuf->ndimensions= self->ndimensions - 1;
+               newbuf->type= self->type;
+               newbuf->buf.asvoid= self->buf.asbyte + i*length*size;
                newbuf->dimensions= MEM_mallocN(newbuf->ndimensions*sizeof(int),
                        "Buffer dimensions");
-               memcpy(newbuf->dimensions, buf->dimensions+1,
+               memcpy(newbuf->dimensions, self->dimensions+1,
                        newbuf->ndimensions*sizeof(int));
 
                return (PyObject *) newbuf;
@@ -383,16 +419,14 @@ static PyObject *Buffer_item(PyObject *self, int i)
        return NULL;
 }
 
-static PyObject *Buffer_slice(PyObject *self, int begin, int end)
+static PyObject *Buffer_slice(Buffer *self, int begin, int end)
 {
-       Buffer *buf= (Buffer *) self;
        PyObject *list;
        int count;
        
-       if (begin<0) begin= 0;
-       if (end>buf->dimensions[0]) 
-               end= buf->dimensions[0];
-       if (begin>end) begin= end;
+       if (begin < 0) begin= 0;
+       if (end > self->dimensions[0]) end= self->dimensions[0];
+       if (begin > end) begin= end;
          
        list= PyList_New(end-begin);
 
@@ -402,21 +436,19 @@ static PyObject *Buffer_slice(PyObject *self, int begin, int end)
        return list;
 }
 
-static int Buffer_ass_item(PyObject *self, int i, PyObject *v)
+static int Buffer_ass_item(Buffer *self, int i, PyObject *v)
 {
-       Buffer *buf= (Buffer *) self;
-       
-       if (i >= buf->dimensions[0]) {
+       if (i >= self->dimensions[0] || i < 0) {
                PyErr_SetString(PyExc_IndexError,
                                "array assignment index out of range");
                return -1;
        }
 
-       if (buf->ndimensions!=1) {
-               PyObject *row= Buffer_item(self, i);
+       if (self->ndimensions!=1) {
+               Buffer *row= (Buffer *)Buffer_item(self, i);
 
                if (row) {
-                       int ret= Buffer_ass_slice(row, 0, buf->dimensions[1], v);
+                       int ret= Buffer_ass_slice(row, 0, self->dimensions[1], v);
                        Py_DECREF(row);
                        return ret;
                }
@@ -425,31 +457,30 @@ static int Buffer_ass_item(PyObject *self, int i, PyObject *v)
                }
        }
 
-       switch(buf->type) {
+       switch(self->type) {
        case GL_BYTE:
-               return PyArg_Parse(v, "b:Expected ints", &buf->buf.asbyte[i]) ? 0:-1;
+               return PyArg_Parse(v, "b:Expected ints", &self->buf.asbyte[i]) ? 0:-1;
        case GL_SHORT:
-               return PyArg_Parse(v, "h:Expected ints", &buf->buf.asshort[i]) ? 0:-1;
+               return PyArg_Parse(v, "h:Expected ints", &self->buf.asshort[i]) ? 0:-1;
        case GL_INT:
-               return PyArg_Parse(v, "i:Expected ints", &buf->buf.asint[i]) ? 0:-1;
+               return PyArg_Parse(v, "i:Expected ints", &self->buf.asint[i]) ? 0:-1;
        case GL_FLOAT:
-               return PyArg_Parse(v, "f:Expected floats", &buf->buf.asfloat[i]) ? 0:-1;
+               return PyArg_Parse(v, "f:Expected floats", &self->buf.asfloat[i]) ? 0:-1;
        case GL_DOUBLE:
-               return PyArg_Parse(v, "d:Expected floats", &buf->buf.asdouble[i]) ? 0:-1;
+               return PyArg_Parse(v, "d:Expected floats", &self->buf.asdouble[i]) ? 0:-1;
        default:
                return 0; /* should never happen */
        }
 }
 
-static int Buffer_ass_slice(PyObject *self, int begin, int end, PyObject *seq)
+static int Buffer_ass_slice(Buffer *self, int begin, int end, PyObject *seq)
 {
-       Buffer *buf= (Buffer *) self;
        PyObject *item;
        int count, err=0;
        
-       if (begin<0) begin= 0;
-       if (end>buf->dimensions[0]) end= buf->dimensions[0];
-       if (begin>end) begin= end;
+       if (begin < 0) begin= 0;
+       if (end > self->dimensions[0]) end= self->dimensions[0];
+       if (begin > end) begin= end;
        
        if (!PySequence_Check(seq)) {
                PyErr_Format(PyExc_TypeError,
@@ -481,27 +512,94 @@ static int Buffer_ass_slice(PyObject *self, int begin, int end, PyObject *seq)
        return err;
 }
 
-static void Buffer_dealloc(PyObject *self)
+static PyObject *Buffer_subscript(Buffer *self, PyObject *item)
 {
-       Buffer *buf = (Buffer *)self;
+       if (PyIndex_Check(item)) {
+               Py_ssize_t i;
+               i = PyNumber_AsSsize_t(item, PyExc_IndexError);
+               if (i == -1 && PyErr_Occurred())
+                       return NULL;
+               if (i < 0)
+                       i += self->dimensions[0];
+               return Buffer_item(self, i);
+       }
+       else if (PySlice_Check(item)) {
+               Py_ssize_t start, stop, step, slicelength;
 
-       if (buf->parent) Py_DECREF(buf->parent);
-       else MEM_freeN (buf->buf.asvoid);
+               if (PySlice_GetIndicesEx((void *)item, self->dimensions[0], &start, &stop, &step, &slicelength) < 0)
+                       return NULL;
+
+               if (slicelength <= 0) {
+                       return PyTuple_New(0);
+               }
+               else if (step == 1) {
+                       return Buffer_slice(self, start, stop);
+               }
+               else {
+                       PyErr_SetString(PyExc_IndexError,
+                                       "slice steps not supported with vectors");
+                       return NULL;
+               }
+       }
+       else {
+               PyErr_Format(PyExc_TypeError,
+                            "buffer indices must be integers, not %.200s",
+                            Py_TYPE(item)->tp_name);
+               return NULL;
+       }
+}
+
+static int Buffer_ass_subscript(Buffer *self, PyObject *item, PyObject *value)
+{
+       if (PyIndex_Check(item)) {
+               Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
+               if (i == -1 && PyErr_Occurred())
+                       return -1;
+               if (i < 0)
+                       i += self->dimensions[0];
+               return Buffer_ass_item(self, i, value);
+       }
+       else if (PySlice_Check(item)) {
+               Py_ssize_t start, stop, step, slicelength;
+
+               if (PySlice_GetIndicesEx((void *)item, self->dimensions[0], &start, &stop, &step, &slicelength) < 0)
+                       return -1;
+
+               if (step == 1)
+                       return Buffer_ass_slice(self, start, stop, value);
+               else {
+                       PyErr_SetString(PyExc_IndexError,
+                                       "slice steps not supported with vectors");
+                       return -1;
+               }
+       }
+       else {
+               PyErr_Format(PyExc_TypeError,
+                            "buffer indices must be integers, not %.200s",
+                            Py_TYPE(item)->tp_name);
+               return -1;
+       }
+}
+
+
+static void Buffer_dealloc(Buffer *self)
+{
+       if (self->parent) Py_DECREF(self->parent);
+       else MEM_freeN (self->buf.asvoid);
+
+       MEM_freeN(self->dimensions);
 
-       MEM_freeN (buf->dimensions);
-       
        PyObject_DEL(self);
 }
 
 
-static PyObject *Buffer_repr(PyObject *self)
+static PyObject *Buffer_repr(Buffer *self)
 {
-       PyObject *list= Buffer_to_list(self);
+       PyObject *list= Buffer_to_list_recursive(self);
        PyObject *repr;
        const char *typestr= "UNKNOWN";
-       Buffer *buffer= (Buffer *)self;
 
-       switch(buffer->type) {
+       switch(self->type) {
        case GL_BYTE:   typestr= "GL_BYTE"; break;
        case GL_SHORT:  typestr= "GL_SHORT"; break;
        case GL_INT:    typestr= "GL_BYTE"; break;
index 287ba45a1cf923ad59c66974e560487cbe9174e2..93a4b3ec2693395ac0bfd442a91f318505e374c9 100644 (file)
 
 set(INC 
        ..
+       ../../blenkernel
        ../../blenlib
+       ../../blenloader
+       ../../editors/include
        ../../makesdna
        ../../makesrna
-       ../../blenkernel
-       ../../blenloader
        ../../windowmanager
-       ../../editors/include
        ../../../../intern/guardedalloc
 )
 
@@ -88,9 +88,6 @@ if(WITH_PYTHON_SAFETY)
 endif()
 
 if(WITH_AUDASPACE)
-       list(APPEND INC
-               ../../../intern/audaspace/intern
-       )
        add_definitions(-DWITH_AUDASPACE)
 endif()
 
index 6ce4954f05365b166d9b4484e1b1fb932522a58c..b647466d2a895358cb56f3bd52a61230c7560040 100644 (file)
 
 set(INC 
        .
-       ../quicktime
-       ../makesdna
-       ../makesrna
-       ../blenlib
-       ../blenkernel
        ../avi
+       ../blenkernel
+       ../blenlib
+       ../blenloader
        ../imbuf
        ../imbuf/intern
-       ../blenloader
+       ../makesdna
+       ../makesrna
        ../render/extern/include
-       ../include
        ../windowmanager
        ../../../intern/guardedalloc
 )
index 003f0b839f81e63ae8bc477479324f984493cb24..90aef816e2ccc3c98e0a990ab3384ac56db59e7e 100644 (file)
 
 
 set(INC 
-       intern/include
        extern/include
+       intern/include
+       ../blenkernel
        ../blenlib
        ../blenloader
+       ../imbuf
        ../makesdna
        ../makesrna
-       ../blenkernel
-       ../imbuf
-       ../../../intern/smoke/extern
-       ../../../intern/mikktspace
        ../../../intern/guardedalloc
+       ../../../intern/mikktspace
+       ../../../intern/smoke/extern
 )
 
 set(INC_SYS
@@ -125,8 +125,12 @@ if(WITH_MOD_SMOKE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC
+               ../quicktime
+       )
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
index f9c1d800c02c4e0a77e2e57224881e33f01087fd..20ac3ba7077bf057b25bd00b78fdf2f32b5915ce 100644 (file)
 
 set(INC
        .
-       ../nodes
-       ../gpu
        ../blenfont
-       ../blenlib
-       ../makesdna
-       ../makesrna
        ../blenkernel
-       ../imbuf
+       ../blenlib
        ../blenloader
        ../editors/include
+       ../gpu
+       ../imbuf
+       ../makesdna
+       ../makesrna
+       ../nodes
        ../render/extern/include
-       ../../../intern/guardedalloc
-       ../../../intern/memutil
+       ../../gameengine/BlenderRoutines
        ../../../intern/elbeem/extern
        ../../../intern/ghost
+       ../../../intern/guardedalloc
+       ../../../intern/memutil
        ../../../intern/opennl/extern
-       ../../../source/gameengine/BlenderRoutines
 )
 
 set(INC_SYS
@@ -89,18 +89,26 @@ if(WITH_OPENCOLLADA)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC
+               ../quicktime
+       )
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${FFMPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-       list(APPEND INC ../python)
+       list(APPEND INC
+               ../python
+       )
        add_definitions(-DWITH_PYTHON)
 
        if(WITH_PYTHON_SECURITY)
index 80f3642748a6f3a9dc710ffc5376033e2cf8a058..f852d061cf746bdc94c6741645a685037eff3744 100644 (file)
@@ -29,12 +29,12 @@ remove_strict_flags()
 
 set(INC 
        .
-       .. 
+       ..
+       ../../blender/blenkernel
+       ../../blender/blenloader
+       ../../blender/makesdna
+       ../../blender/makesrna
        ../../../intern/guardedalloc
-       ../../../source/blender/makesdna
-       ../../../source/blender/blenloader
-       ../../../source/blender/makesrna
-       ../../../source/blender/blenkernel
 )
 
 set(INC_SYS
index 28f567cc3cd55123f0cbe9ec9187f3aeba698b43..5a7304765e48c9b5dcea46f99f8597a51bb1722b 100644 (file)
@@ -1,33 +1,33 @@
 
 set(INC
        .
-       ../../../intern/string
+       ../Converter
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/Bullet
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenfont
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/editors/include
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/makesrna
+       ../../blender/windowmanager
+       ../../../extern/bullet2/src
        ../../../intern/container
        ../../../intern/guardedalloc
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-       ../../../source/gameengine/Converter
-       ../../../source/blender/imbuf
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji 
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel 
-       ../../../source/blender/blenfont
-       ../../../source/blender/editors/include
-       ../../../source/blender/windowmanager
-       ../../../source/blender
-       ../../../source/blender/makesdna
-       ../../../source/blender/makesrna 
-       ../../../source/gameengine/Rasterizer 
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph 
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Physics/Bullet
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
-       ../../../extern/bullet2/src
+       ../../../intern/string
        ${GLEW_INCLUDE_PATH}
 )
 
index c905b8634a060e90acc98adc2deea5de211cc898..45a7701d4046870c5cddd0a8a94d8117c1e531cc 100644 (file)
 
 set(INC
        .
-       ../../../intern/string
-       ../../../intern/guardedalloc
+       ../BlenderRoutines
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Ketsji/KXNetwork
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/Bullet
+       ../Physics/Dummy
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/gpu
+       ../../blender/ikplugin
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/makesrna
+       ../../blender/windowmanager
+       ../../../extern/bullet2/src
        ../../../intern/container
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/Converter
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/imbuf
+       ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji
-       ../../../source/gameengine/Ketsji/KXNetwork
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel
-       ../../../source/blender/windowmanager
-       ../../../source/blender
-       ../../../source/blender/makesdna
-       ../../../source/blender/makesrna
-       ../../../source/gameengine/Rasterizer
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Physics/Bullet
-       ../../../source/gameengine/Physics/Dummy
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
-       ../../../source/blender/ikplugin
-       ../../../extern/bullet2/src
+       ../../../intern/string
 )
 
 set(INC_SYS
index 83d44e1b318e0ec9a1f48715b848c5a670d81943..ad987091790ea1e27e836b3285f824aa7ecb880f 100644 (file)
 
 set(INC
        .
-       ../../../intern/string
+       ../SceneGraph
+       ../../blender/blenloader
        ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/SceneGraph
-       ../../../source/blender/blenloader
+       ../../../intern/string
 )
 
 set(INC_SYS
index b6721650badf4601fa9ad8c0d1c402bbe69183f4..bd4171653377e6a3d1a548a4a7a4e3324c492be3 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       . 
-       ../../../intern/string
+       .
+       ../Expressions
+       ../Rasterizer
+       ../SceneGraph
        ../../../intern/container
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/SceneGraph
        ../../../intern/moto/include
-       ../../../source/gameengine/Rasterizer
+       ../../../intern/string
 )
 
 set(INC_SYS
@@ -39,8 +39,6 @@ set(INC_SYS
 )
 
 set(SRC
-       Joystick/SCA_Joystick.cpp
-       Joystick/SCA_JoystickEvents.cpp
        SCA_2DFilterActuator.cpp
        SCA_ANDController.cpp
        SCA_ActuatorEventManager.cpp
@@ -81,10 +79,9 @@ set(SRC
        SCA_TimeEventManager.cpp
        SCA_XNORController.cpp
        SCA_XORController.cpp
+       Joystick/SCA_Joystick.cpp
+       Joystick/SCA_JoystickEvents.cpp
 
-       Joystick/SCA_Joystick.h
-       Joystick/SCA_JoystickDefines.h
-       Joystick/SCA_JoystickPrivate.h
        SCA_2DFilterActuator.h
        SCA_ANDController.h
        SCA_ActuatorEventManager.h
@@ -125,10 +122,15 @@ set(SRC
        SCA_TimeEventManager.h
        SCA_XNORController.h
        SCA_XORController.h
+       Joystick/SCA_Joystick.h
+       Joystick/SCA_JoystickDefines.h
+       Joystick/SCA_JoystickPrivate.h
 )
 
 if(WITH_SDL)
-       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+       list(APPEND INC_SYS
+               ${SDL_INCLUDE_DIR}
+       )
 else()
        add_definitions(-DDISABLE_SDL)
 endif()
index d16ec6a2f222f5980ca305d3aaa8991053efd8f9..8c5897fa48ef610de1ebe0585e28df23fa6ac525 100644 (file)
 
 set(INC
        .
-       ../../../../intern/string
+       ../ghost
+       ../../BlenderRoutines
+       ../../Converter
+       ../../Expressions
+       ../../GameLogic
+       ../../Ketsji
+       ../../Network
+       ../../Network/LoopBackNetwork
+       ../../Physics/common
+       ../../Rasterizer
+       ../../Rasterizer/RAS_OpenGLRasterizer
+       ../../SceneGraph
+       ../../../blender
+       ../../../blender/blenfont
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/imbuf
+       ../../../blender/makesdna
+       ../../../../intern/container
        ../../../../intern/ghost
        ../../../../intern/guardedalloc
-       ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../../source/gameengine/Converter
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/blender/imbuf
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenfont
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender
-       ../../../../source/blender/makesdna
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/Network
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Physics/common
-       ../../../../source/gameengine/Network/LoopBackNetwork
-       ../../../../source/gameengine/GamePlayer/ghost
-       ../../../../source/blender/blenloader
-       ../../../../source/blender/gpu
+       ../../../../intern/string
 )
 
 set(INC_SYS
@@ -61,7 +61,6 @@ set(INC_SYS
 )
 
 set(SRC 
-       bmfont.cpp
        GPC_Canvas.cpp
        GPC_Engine.cpp
        GPC_KeyboardDevice.cpp
@@ -71,6 +70,7 @@ set(SRC
        GPC_RawLogoArrays.cpp
        GPC_RenderTools.cpp
        GPC_System.cpp
+       bmfont.cpp
 
        GPC_Canvas.h
        GPC_Engine.h
index 5ac121099c382f04a1e159441508f4f77472e3f8..944ec9abd6726b0059a77b51d80ae0b8904c7850 100644 (file)
 
 set(INC
        .
-       ../../../../intern/string
+       ../common
+       ../../BlenderRoutines
+       ../../Converter
+       ../../Expressions
+       ../../GameLogic
+       ../../Ketsji
+       ../../Network
+       ../../Network/LoopBackNetwork
+       ../../Physics/common
+       ../../Rasterizer
+       ../../Rasterizer/RAS_OpenGLRasterizer
+       ../../SceneGraph
+       ../../../blender
+       ../../../blender/blenfont
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/imbuf
+       ../../../blender/makesdna
+       ../../../blender/makesrna
+       ../../../../intern/container
        ../../../../intern/ghost
        ../../../../intern/guardedalloc
-       ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/gameengine/Converter
-       ../../../../source/blender/imbuf
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/blender/blenfont
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/makesrna
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/Network
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Physics/common
-       ../../../../source/gameengine/Network/LoopBackNetwork
-       ../../../../source/gameengine/GamePlayer/common
-       ../../../../source/blender/blenloader
-       ../../../../source/blender/gpu
+       ../../../../intern/string
 )
 
 set(INC_SYS
@@ -62,9 +62,9 @@ set(INC_SYS
 set(SRC 
        GPG_Application.cpp
        GPG_Canvas.cpp
-       GPG_ghost.cpp
        GPG_KeyboardDevice.cpp
        GPG_System.cpp
+       GPG_ghost.cpp
 
        GPG_Application.h
        GPG_Canvas.h
index 7b3906e0846046f6386e8cd98e16606e5a01ccce..8222bf4b65f0288956a134f92f47bb99c5cbdf76 100644 (file)
 
 set(INC
        .
-       ../../../intern/string
-       ../../../intern/guardedalloc
+       KXNetwork
+       ../BlenderRoutines
+       ../Converter
+       ../Expressions
+       ../GameLogic
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenfont
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/python
+       ../../blender/python/generic
+       ../../blender/python/mathutils
        ../../../intern/container
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-       ../../../source/gameengine/Converter
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/imbuf
+       ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji 
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenfont
-       ../../../source/blender/blenkernel
-       ../../../source/blender/python
-       ../../../source/blender/python/generic
-       ../../../source/blender/python/mathutils
-       ../../../source/blender 
-       ../../../source/blender/makesdna 
-       ../../../source/gameengine/Rasterizer 
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/Ketsji/KXNetwork
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph 
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
+       ../../../intern/string
 )
 
 set(INC_SYS
@@ -129,6 +128,10 @@ set(SRC
        KX_WorldInfo.cpp
        KX_WorldIpoController.cpp
 
+       BL_BlenderShader.h
+       BL_Material.h
+       BL_Shader.h
+       BL_Texture.h
        KX_ArmatureSensor.h
        KX_BlenderMaterial.h
        KX_BulletPhysicsController.h
@@ -201,16 +204,14 @@ set(SRC
        KX_VisibilityActuator.h
        KX_WorldInfo.h
        KX_WorldIpoController.h
-       BL_BlenderShader.h
-       BL_Material.h
-       BL_Shader.h
-       BL_Texture.h
 )
 
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_SDL)
-       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})  
+       list(APPEND INC_SYS
+               ${SDL_INCLUDE_DIR}
+       )
 else()
        add_definitions(-DDISABLE_SDL)
 endif()
@@ -229,7 +230,7 @@ endif()
 if(WITH_BULLET)
        list(APPEND INC
                ../../../extern/bullet2/src
-               ../../../source/gameengine/Physics/Bullet
+               ../Physics/Bullet
        )
        add_definitions(-DUSE_BULLET)
 endif()
index b814956680169fcff86aff29614433a85c1cb853..1ebf11531507ef0ff2faf7633ccd9299e234d3d7 100644 (file)
 
 set(INC
        .
-       ../../../../intern/string
+       ..
+       ../../Expressions
+       ../../GameLogic
+       ../../Network
+       ../../SceneGraph
        ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Network
+       ../../../../intern/string
 )
 
 set(INC_SYS
index e1f3bfaac77c62553216b828a0e467e65f65fef2..4d6d035c63d3f4206d4e7d63674f1e41e6a1570e 100644 (file)
@@ -26,9 +26,9 @@
 
 set(INC
        .
-       ../../../intern/string
        ../../../intern/container
        ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS
index 9c3936987f224e9746b6b950f5f465e6b725d111..c816a30f1a835407cdcbc345f157c78b6e13c5ee 100644 (file)
@@ -26,9 +26,9 @@
 
 set(INC
        .
-       ../../../../intern/string
+       ..
        ../../../../intern/container
-       ../../../../source/gameengine/Network
+       ../../../../intern/string
 )
 
 set(INC_SYS
index aadd11cc0364788e04856fb15265c200005db5e8..971c8f979f396dea0b21ea45a4d1dde377c58844 100644 (file)
@@ -30,19 +30,19 @@ remove_strict_flags()
 set(INC
        .
        ../common
-       ../../../../extern/bullet2/src
-       ../../../../intern/moto/include
-       ../../../../intern/guardedalloc
-       ../../../../intern/container
-       ../../../../intern/string
-       ../../Rasterizer
-       ../../Ketsji
        ../../Expressions
        ../../GameLogic
+       ../../Ketsji
+       ../../Rasterizer
        ../../SceneGraph
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenkernel
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/makesdna
+       ../../../../extern/bullet2/src
+       ../../../../intern/container
+       ../../../../intern/guardedalloc
+       ../../../../intern/moto/include
+       ../../../../intern/string
 )
 
 set(INC_SYS
index b705d3151b2e119a1957805aaee247e22fe69722..23d746f88bc83ef409fe50804dfab2015fc1c7cd 100644 (file)
 
 set(INC
        .
-       ../../../source/blender/makesdna
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Ketsji
-       ../../../intern/string
+       ../Expressions
+       ../Ketsji
+       ../SceneGraph
+       ../../blender/makesdna
        ../../../intern/container
-       ../../../intern/moto/include
        ../../../intern/guardedalloc
-       ../Expressions
+       ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS
index a005bb1108d603d4aa46a1ca88fc2569d3f75880..b0ef6fab251d3db9be90bc8fd966df1e2af09a3b 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ../../../../intern/string
+       ..
+       ../../BlenderRoutines
+       ../../Ketsji
+       ../../SceneGraph
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/makesdna
        ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/blender/gpu
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenloader
+       ../../../../intern/string
 )
 
 set(INC_SYS
index c412363dc3b7f2eab5ef26dc5e8d5aad0c3d3928..04683a5f99b2498f3847554c716d92be31b97900 100644 (file)
 
 set(INC
        .
-       ../../../source/gameengine/Ketsji
-       ../../../source/gameengine/Expressions
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Rasterizer
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel
-       ../../../source/blender/makesdna
-       ../../../source/blender/editors/include
-       ../../../source/blender/imbuf
-       ../../../source/blender/python
-       ../../../source/blender/python/generic
-       ../../../source/blender/gpu
+       ../BlenderRoutines
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/editors/include
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/python
+       ../../blender/python/generic
        ../../../intern/container
-       ../../../intern/string
-       ../../../intern/moto/include
-       ../../../intern/guardedalloc
        ../../../intern/ffmpeg
+       ../../../intern/guardedalloc
+       ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS