[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17279] branches/projection-paint: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17236 :HEAD

Campbell Barton ideasman42 at gmail.com
Sat Nov 1 23:04:42 CET 2008 

Revision: 17279
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17279
Author:   campbellbarton
Date:     2008-11-01 23:04:41 +0100 (Sat, 01 Nov 2008)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17236:HEAD

Modified Paths:
--------------
    branches/projection-paint/config/darwin-config.py
    branches/projection-paint/config/openbsd3-config.py
    branches/projection-paint/config/sunos5-config.py
    branches/projection-paint/config/win32-mingw-config.py
    branches/projection-paint/config/win32-vc-config.py
    branches/projection-paint/doc/blender-scons.txt
    branches/projection-paint/extern/ffmpeg/Makefile
    branches/projection-paint/extern/ffmpeg/SConscript
    branches/projection-paint/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/projection-paint/projectfiles_vc7/blender/blender.sln
    branches/projection-paint/projectfiles_vc7/blender/blender.vcproj
    branches/projection-paint/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
    branches/projection-paint/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/projection-paint/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/projection-paint/source/blender/imbuf/intern/util.c
    branches/projection-paint/source/blender/python/api2_2x/matrix.c
    branches/projection-paint/source/blender/render/intern/source/envmap.c
    branches/projection-paint/source/blender/render/intern/source/sss.c
    branches/projection-paint/source/blender/src/interface.c
    branches/projection-paint/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/projection-paint/source/gameengine/CMakeLists.txt
    branches/projection-paint/source/gameengine/Ketsji/BL_Texture.h
    branches/projection-paint/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/projection-paint/source/gameengine/Ketsji/KX_Camera.cpp
    branches/projection-paint/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/projection-paint/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/projection-paint/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/projection-paint/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/projection-paint/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/projection-paint/source/gameengine/Ketsji/KX_PythonInit.h
    branches/projection-paint/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/projection-paint/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/projection-paint/source/gameengine/SConscript

Added Paths:
-----------
    branches/projection-paint/extern/ffmpeg/libavdevice/
    branches/projection-paint/extern/ffmpeg/libavdevice/Makefile
    branches/projection-paint/extern/ffmpeg/libavdevice/alldevices.c
    branches/projection-paint/extern/ffmpeg/libavdevice/audio.c
    branches/projection-paint/extern/ffmpeg/libavdevice/avdevice.h
    branches/projection-paint/extern/ffmpeg/libavdevice/beosaudio.cpp
    branches/projection-paint/extern/ffmpeg/libavdevice/bktr.c
    branches/projection-paint/extern/ffmpeg/libavdevice/dv1394.c
    branches/projection-paint/extern/ffmpeg/libavdevice/dv1394.h
    branches/projection-paint/extern/ffmpeg/libavdevice/libdc1394.c
    branches/projection-paint/extern/ffmpeg/libavdevice/v4l.c
    branches/projection-paint/extern/ffmpeg/libavdevice/v4l2.c
    branches/projection-paint/extern/ffmpeg/libavdevice/x11grab.c
    branches/projection-paint/scons/
    branches/projection-paint/scons/scons-LICENSE
    branches/projection-paint/scons/scons-README
    branches/projection-paint/scons/scons-local-1.1.0/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Action.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Builder.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/CacheDir.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Conftest.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Debug.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Defaults.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Environment.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Errors.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Executor.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Job.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Memoize.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/Alias.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/FS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/Python.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/BoolOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/EnumOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/ListOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/PackageOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/PathOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/PathList.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/aix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/cygwin.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/darwin.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/hpux.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/irix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/os2.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/posix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/sunos.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/win32.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/SConf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/SConsign.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/C.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/D.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/Dir.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/Fortran.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/IDL.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/LaTeX.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/Prog.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/RC.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/Interactive.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/Main.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/SConsOptions.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/SConscript.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Sig.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Subst.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Taskmaster.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/386asm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/BitKeeper.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/CVS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/FortranCommon.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/JavaCommon.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/Perforce.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/PharLapCommon.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/RCS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/SCCS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/Subversion.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixc++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixf77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixlink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/applelink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/as.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/bcc32.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/c++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/cc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/cvf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/default.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dmd.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dvi.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dvipdf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dvips.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/f77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/f90.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/f95.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/filesystem.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/fortran.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/g++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/g77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gas.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gfortran.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gnulink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gs.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/hpc++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/hpcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/hplink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/icc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/icl.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ifl.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ifort.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ilink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ilink32.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/install.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/intelc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/jar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/javac.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/javah.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/latex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/lex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/link.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/linkloc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/m4.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/masm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/midl.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mingw.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mslib.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mslink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/msvc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/msvs.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mwcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mwld.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/nasm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/ipk.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/msi.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/rpm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/src_tarbz2.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/src_targz.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/src_zip.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/tarbz2.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/targz.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/zip.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/pdf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/pdflatex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/pdftex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/qt.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/rmic.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/rpcgen.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/rpm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgiar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgic++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgicc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgilink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunc++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/suncc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunf77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunf90.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunf95.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunlink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/swig.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/tar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/tex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/tlib.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/wix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/yacc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/zip.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Util.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/BoolVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/EnumVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/ListVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/PackageVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/PathVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Warnings.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_UserString.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_hashlib.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_itertools.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_optparse.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_sets.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_sets15.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_shlex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_subprocess.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_textwrap.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/builtins.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/cpp.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/dblite.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/exitfuncs.py
    branches/projection-paint/scons/scons-time.py
    branches/projection-paint/scons/scons.py
    branches/projection-paint/scons/sconsign.py
    branches/projection-paint/source/gameengine/VideoTexture/
    branches/projection-paint/source/gameengine/VideoTexture/BlendType.h
    branches/projection-paint/source/gameengine/VideoTexture/CMakeLists.txt
    branches/projection-paint/source/gameengine/VideoTexture/Common.h
    branches/projection-paint/source/gameengine/VideoTexture/Exception.cpp
    branches/projection-paint/source/gameengine/VideoTexture/Exception.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterBase.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterBase.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterColor.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterColor.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterSource.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterSource.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageBase.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageBase.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageMix.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageMix.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageRender.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageRender.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageViewport.h
    branches/projection-paint/source/gameengine/VideoTexture/Makefile
    branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.h
    branches/projection-paint/source/gameengine/VideoTexture/SConscript
    branches/projection-paint/source/gameengine/VideoTexture/Texture.cpp
    branches/projection-paint/source/gameengine/VideoTexture/Texture.h
    branches/projection-paint/source/gameengine/VideoTexture/VideoBase.cpp
    branches/projection-paint/source/gameengine/VideoTexture/VideoBase.h
    branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/projection-paint/source/gameengine/VideoTexture/blendVideoTex.cpp

Removed Paths:
-------------
    branches/projection-paint/extern/ffmpeg/libavdevice/Makefile
    branches/projection-paint/extern/ffmpeg/libavdevice/alldevices.c
    branches/projection-paint/extern/ffmpeg/libavdevice/audio.c
    branches/projection-paint/extern/ffmpeg/libavdevice/avdevice.h
    branches/projection-paint/extern/ffmpeg/libavdevice/beosaudio.cpp
    branches/projection-paint/extern/ffmpeg/libavdevice/bktr.c
    branches/projection-paint/extern/ffmpeg/libavdevice/dv1394.c
    branches/projection-paint/extern/ffmpeg/libavdevice/dv1394.h
    branches/projection-paint/extern/ffmpeg/libavdevice/libdc1394.c
    branches/projection-paint/extern/ffmpeg/libavdevice/v4l.c
    branches/projection-paint/extern/ffmpeg/libavdevice/v4l2.c
    branches/projection-paint/extern/ffmpeg/libavdevice/x11grab.c
    branches/projection-paint/scons/scons-LICENSE
    branches/projection-paint/scons/scons-README
    branches/projection-paint/scons/scons-local-1.1.0/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Action.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Builder.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/CacheDir.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Conftest.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Debug.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Defaults.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Environment.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Errors.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Executor.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Job.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Memoize.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/Alias.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/FS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/Python.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Node/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/BoolOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/EnumOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/ListOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/PackageOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/PathOption.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Options/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/PathList.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/aix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/cygwin.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/darwin.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/hpux.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/irix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/os2.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/posix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/sunos.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Platform/win32.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/SConf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/SConsign.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/C.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/D.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/Dir.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/Fortran.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/IDL.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/LaTeX.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/Prog.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/RC.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Scanner/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/Interactive.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/Main.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/SConsOptions.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/SConscript.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Script/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Sig.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Subst.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Taskmaster.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/386asm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/BitKeeper.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/CVS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/FortranCommon.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/JavaCommon.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/Perforce.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/PharLapCommon.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/RCS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/SCCS.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/Subversion.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixc++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixf77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/aixlink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/applelink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/as.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/bcc32.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/c++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/cc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/cvf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/default.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dmd.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dvi.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dvipdf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/dvips.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/f77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/f90.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/f95.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/filesystem.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/fortran.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/g++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/g77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gas.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gfortran.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gnulink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/gs.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/hpc++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/hpcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/hplink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/icc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/icl.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ifl.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ifort.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ilink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/ilink32.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/install.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/intelc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/jar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/javac.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/javah.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/latex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/lex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/link.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/linkloc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/m4.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/masm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/midl.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mingw.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mslib.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mslink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/msvc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/msvs.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mwcc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/mwld.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/nasm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/ipk.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/msi.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/rpm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/src_tarbz2.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/src_targz.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/src_zip.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/tarbz2.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/targz.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/packaging/zip.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/pdf.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/pdflatex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/pdftex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/qt.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/rmic.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/rpcgen.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/rpm.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgiar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgic++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgicc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sgilink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunc++.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/suncc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunf77.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunf90.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunf95.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/sunlink.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/swig.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/tar.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/tex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/tlib.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/wix.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/yacc.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Tool/zip.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Util.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/BoolVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/EnumVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/ListVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/PackageVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/PathVariable.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Variables/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/Warnings.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/__init__.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_UserString.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_hashlib.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_itertools.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_optparse.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_sets.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_sets15.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_shlex.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_subprocess.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/_scons_textwrap.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/compat/builtins.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/cpp.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/dblite.py
    branches/projection-paint/scons/scons-local-1.1.0/SCons/exitfuncs.py
    branches/projection-paint/scons/scons-time.py
    branches/projection-paint/scons/scons.py
    branches/projection-paint/scons/sconsign.py
    branches/projection-paint/source/gameengine/VideoTexture/BlendType.h
    branches/projection-paint/source/gameengine/VideoTexture/CMakeLists.txt
    branches/projection-paint/source/gameengine/VideoTexture/Common.h
    branches/projection-paint/source/gameengine/VideoTexture/Exception.cpp
    branches/projection-paint/source/gameengine/VideoTexture/Exception.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterBase.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterBase.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterColor.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterColor.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.h
    branches/projection-paint/source/gameengine/VideoTexture/FilterSource.cpp
    branches/projection-paint/source/gameengine/VideoTexture/FilterSource.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageBase.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageBase.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageMix.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageMix.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageRender.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageRender.h
    branches/projection-paint/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageViewport.h
    branches/projection-paint/source/gameengine/VideoTexture/Makefile
    branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.h
    branches/projection-paint/source/gameengine/VideoTexture/SConscript
    branches/projection-paint/source/gameengine/VideoTexture/Texture.cpp
    branches/projection-paint/source/gameengine/VideoTexture/Texture.h
    branches/projection-paint/source/gameengine/VideoTexture/VideoBase.cpp
    branches/projection-paint/source/gameengine/VideoTexture/VideoBase.h
    branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/projection-paint/source/gameengine/VideoTexture/blendVideoTex.cpp

Modified: branches/projection-paint/config/darwin-config.py
===================================================================
--- branches/projection-paint/config/darwin-config.py	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/config/darwin-config.py	2008-11-01 22:04:41 UTC (rev 17279)
@@ -251,9 +251,9 @@
 ##
 CC = 'gcc'
 CXX = 'g++'
-C_WARN = ' -Wall  -Wno-long-double -Wdeclaration-after-statement '
+C_WARN = ['-Wdeclaration-after-statement']
 
-CC_WARN = ' -Wall  -Wno-long-double'
+CC_WARN = ['-Wall', '-Wno-long-double']
 
 ##FIX_STUBS_WARNINGS = -Wno-unused
 

Modified: branches/projection-paint/config/openbsd3-config.py
===================================================================
--- branches/projection-paint/config/openbsd3-config.py	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/config/openbsd3-config.py	2008-11-01 22:04:41 UTC (rev 17279)
@@ -145,9 +145,9 @@
 ##
 CC = 'gcc'
 CXX = 'g++'
-C_WARN = '-Wall -Wdeclaration-after-statement'
+C_WARN = ['-Wdeclaration-after-statement']
 
-CC_WARN = '-Wall'
+CC_WARN = ['-Wall']
 
 ##FIX_STUBS_WARNINGS = -Wno-unused
 

Modified: branches/projection-paint/config/sunos5-config.py
===================================================================
--- branches/projection-paint/config/sunos5-config.py	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/config/sunos5-config.py	2008-11-01 22:04:41 UTC (rev 17279)
@@ -159,9 +159,9 @@
 ##ARFLAGS = ruv
 ##ARFLAGSQUIET = ru
 ##
-C_WARN = '-Wall -Wno-char-subscripts -Wdeclaration-after-statement'
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
 
-CC_WARN = '-Wall'
+CC_WARN = ['-Wall']
 
 ##FIX_STUBS_WARNINGS = -Wno-unused
 

Modified: branches/projection-paint/config/win32-mingw-config.py
===================================================================
--- branches/projection-paint/config/win32-mingw-config.py	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/config/win32-mingw-config.py	2008-11-01 22:04:41 UTC (rev 17279)
@@ -153,7 +153,7 @@
 REL_CFLAGS = [ '-O2' ]
 REL_CCFLAGS = [ '-O2' ]
 
-C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
+C_WARN = [ '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
 
 CC_WARN = [ '-Wall' ]
 

Modified: branches/projection-paint/config/win32-vc-config.py
===================================================================
--- branches/projection-paint/config/win32-vc-config.py	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/config/win32-vc-config.py	2008-11-01 22:04:41 UTC (rev 17279)
@@ -161,6 +161,7 @@
 CXX = 'cl.exe'
 
 CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CXXFLAGS = ['/EHsc']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 

Modified: branches/projection-paint/doc/blender-scons.txt
===================================================================
--- branches/projection-paint/doc/blender-scons.txt	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/doc/blender-scons.txt	2008-11-01 22:04:41 UTC (rev 17279)
@@ -1,9 +1,5 @@
 $Id$
 
-    Note: The current official release of SCons is 0.98, but
-    our system still works for 0.97. However, this will be fixed
-    soon.
-
     Blenders SCons build scripts
     ============================
 
@@ -31,7 +27,7 @@
 
     To build Blender with the SCons scripts you need a full Python
     install, version 2.4 or later (http://www.python.org) and a SCons
-    installation, version v0.97 (http://www.scons.org).
+    installation, version v1.1.0 (http://www.scons.org).
 
     Check from the page
     http://www.blender.org/development/building-blender/getting-dependencies/

Modified: branches/projection-paint/extern/ffmpeg/Makefile
===================================================================
--- branches/projection-paint/extern/ffmpeg/Makefile	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/extern/ffmpeg/Makefile	2008-11-01 22:04:41 UTC (rev 17279)
@@ -35,7 +35,7 @@
 ALLDIRS = libavcodec libavformat libavutil libswscale
 
 config::
-	./configure --disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads 
+	./configure --disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads 
 all::
 	@for i in $(ALLDIRS); do \
 	    echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\

Modified: branches/projection-paint/extern/ffmpeg/SConscript
===================================================================
--- branches/projection-paint/extern/ffmpeg/SConscript	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/extern/ffmpeg/SConscript	2008-11-01 22:04:41 UTC (rev 17279)
@@ -7,9 +7,9 @@
 root = "extern/ffmpeg"
 
 if env['OURPLATFORM'] == 'win32-mingw':
-    ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame"
+    ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame"
 else:
-    ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame"
+    ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame"
 
 if env['WITH_BF_OGG']:
     ffmpeg_switches += " --enable-libogg --enable-libtheora --enable-libvorbis"

Copied: branches/projection-paint/extern/ffmpeg/libavdevice (from rev 17278, trunk/blender/extern/ffmpeg/libavdevice)

Deleted: branches/projection-paint/extern/ffmpeg/libavdevice/Makefile
===================================================================
--- trunk/blender/extern/ffmpeg/libavdevice/Makefile	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/extern/ffmpeg/libavdevice/Makefile	2008-11-01 22:04:41 UTC (rev 17279)
@@ -1,32 +0,0 @@
-include ../config.mak
-
-NAME=avdevice
-LIBVERSION=$(LAVDVERSION)
-LIBMAJOR=$(LAVDMAJOR)
-
-EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavcodec  -lavcodec$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavutil   -lavutil$(BUILDSUF) $(EXTRALIBS)
-
-CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
-
-OBJS = alldevices.o
-
-HEADERS = avdevice.h
-
-# input/output devices
-OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.o
-OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
-OBJS-$(CONFIG_OSS_DEMUXER)               += audio.o
-OBJS-$(CONFIG_OSS_MUXER)                 += audio.o
-OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
-OBJS-$(CONFIG_V4L_DEMUXER)               += v4l.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
-
-# external libraries
-OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.o
-
-CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)     += beosaudio.o
-CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER)       += beosaudio.o
-
-include ../common.mak

Copied: branches/projection-paint/extern/ffmpeg/libavdevice/Makefile (from rev 17278, trunk/blender/extern/ffmpeg/libavdevice/Makefile)
===================================================================
--- branches/projection-paint/extern/ffmpeg/libavdevice/Makefile	                        (rev 0)
+++ branches/projection-paint/extern/ffmpeg/libavdevice/Makefile	2008-11-01 22:04:41 UTC (rev 17279)
@@ -0,0 +1,32 @@
+include ../config.mak
+
+NAME=avdevice
+LIBVERSION=$(LAVDVERSION)
+LIBMAJOR=$(LAVDMAJOR)
+
+EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) \
+             -L$(BUILD_ROOT)/libavcodec  -lavcodec$(BUILDSUF) \
+             -L$(BUILD_ROOT)/libavutil   -lavutil$(BUILDSUF) $(EXTRALIBS)
+
+CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
+
+OBJS = alldevices.o
+
+HEADERS = avdevice.h
+
+# input/output devices
+OBJS-$(CONFIG_BKTR_DEMUXER)              += bktr.o
+OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
+OBJS-$(CONFIG_OSS_DEMUXER)               += audio.o
+OBJS-$(CONFIG_OSS_MUXER)                 += audio.o
+OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
+OBJS-$(CONFIG_V4L_DEMUXER)               += v4l.o
+OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
+
+# external libraries
+OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.o
+
+CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER)     += beosaudio.o
+CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER)       += beosaudio.o
+
+include ../common.mak

Deleted: branches/projection-paint/extern/ffmpeg/libavdevice/alldevices.c
===================================================================
--- trunk/blender/extern/ffmpeg/libavdevice/alldevices.c	2008-11-01 21:41:22 UTC (rev 17278)
+++ branches/projection-paint/extern/ffmpeg/libavdevice/alldevices.c	2008-11-01 22:04:41 UTC (rev 17279)
@@ -1,50 +0,0 @@
-/*
- * Register all the grabbing devices.
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#include "avformat.h"
-#include "avdevice.h"
-
-#define REGISTER_MUXER(X,x) { \
-          extern AVOutputFormat x##_muxer; \
-          if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer); }
-#define REGISTER_DEMUXER(X,x) { \
-          extern AVInputFormat x##_demuxer; \

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list