svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17236:HEAD
authorCampbell Barton <ideasman42@gmail.com>
Sat, 1 Nov 2008 22:04:41 +0000 (22:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 1 Nov 2008 22:04:41 +0000 (22:04 +0000)
commit3c9520f92fc0fc69614a1eea37a1e2d72461e50d
tree86ecf049718f8279c32cc9714c97e20bcc6b2215
parent5b205ce8524bb26908f5a2512f4ccaeb843dad01
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17236:HEAD
67 files changed:
config/darwin-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
doc/blender-scons.txt
intern/ghost/intern/GHOST_WindowWin32.cpp
projectfiles_vc7/blender/blender.sln
projectfiles_vc7/blender/blender.vcproj
projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
projectfiles_vc7/blender/src/BL_src.vcproj
source/blender/blenkernel/intern/CCGSubSurf.c
source/blender/imbuf/intern/util.c
source/blender/python/api2_2x/matrix.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/sss.c
source/blender/src/interface.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/CMakeLists.txt
source/gameengine/Ketsji/BL_Texture.h
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_PythonInit.h
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_2DFilterManager.h
source/gameengine/SConscript
source/gameengine/VideoTexture/BlendType.h [new file with mode: 0644]
source/gameengine/VideoTexture/CMakeLists.txt [new file with mode: 0644]
source/gameengine/VideoTexture/Common.h [new file with mode: 0644]
source/gameengine/VideoTexture/Exception.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/Exception.h [new file with mode: 0644]
source/gameengine/VideoTexture/FilterBase.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/FilterBase.h [new file with mode: 0644]
source/gameengine/VideoTexture/FilterBlueScreen.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/FilterBlueScreen.h [new file with mode: 0644]
source/gameengine/VideoTexture/FilterColor.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/FilterColor.h [new file with mode: 0644]
source/gameengine/VideoTexture/FilterNormal.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/FilterNormal.h [new file with mode: 0644]
source/gameengine/VideoTexture/FilterSource.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/FilterSource.h [new file with mode: 0644]
source/gameengine/VideoTexture/ImageBase.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/ImageBase.h [new file with mode: 0644]
source/gameengine/VideoTexture/ImageBuff.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/ImageBuff.h [new file with mode: 0644]
source/gameengine/VideoTexture/ImageMix.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/ImageMix.h [new file with mode: 0644]
source/gameengine/VideoTexture/ImageRender.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/ImageRender.h [new file with mode: 0644]
source/gameengine/VideoTexture/ImageViewport.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/ImageViewport.h [new file with mode: 0644]
source/gameengine/VideoTexture/Makefile [new file with mode: 0644]
source/gameengine/VideoTexture/PyTypeList.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/PyTypeList.h [new file with mode: 0644]
source/gameengine/VideoTexture/SConscript [new file with mode: 0644]
source/gameengine/VideoTexture/Texture.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/Texture.h [new file with mode: 0644]
source/gameengine/VideoTexture/VideoBase.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/VideoBase.h [new file with mode: 0644]
source/gameengine/VideoTexture/VideoFFmpeg.cpp [new file with mode: 0644]
source/gameengine/VideoTexture/VideoFFmpeg.h [new file with mode: 0644]
source/gameengine/VideoTexture/blendVideoTex.cpp [new file with mode: 0644]