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

Campbell Barton ideasman42 at gmail.com
Tue Nov 11 13:57:00 CET 2008 

Revision: 17405
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17405
Author:   campbellbarton
Date:     2008-11-11 13:56:57 +0100 (Tue, 11 Nov 2008)

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

Modified Paths:
--------------
    branches/projection-paint/SConstruct
    branches/projection-paint/config/darwin-config.py
    branches/projection-paint/config/linux2-config.py
    branches/projection-paint/config/linuxcross-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/doc/blender-scons.txt
    branches/projection-paint/intern/SoundSystem/intern/SND_Utils.cpp
    branches/projection-paint/release/scripts/image_edit.py
    branches/projection-paint/source/blender/blenkernel/intern/displist.c
    branches/projection-paint/source/blender/blenlib/BLI_blenlib.h
    branches/projection-paint/source/blender/imbuf/intern/imageprocess.c
    branches/projection-paint/source/blender/include/transform.h
    branches/projection-paint/source/blender/makesdna/DNA_armature_types.h
    branches/projection-paint/source/blender/makesdna/DNA_object_types.h
    branches/projection-paint/source/blender/python/BPY_interface.c
    branches/projection-paint/source/blender/python/api2_2x/Draw.c
    branches/projection-paint/source/blender/python/api2_2x/doc/Draw.py
    branches/projection-paint/source/blender/src/buttons_editing.c
    branches/projection-paint/source/blender/src/interface_draw.c
    branches/projection-paint/source/blender/src/poselib.c
    branches/projection-paint/source/blender/src/seqaudio.c
    branches/projection-paint/source/blender/src/transform.c
    branches/projection-paint/source/blender/src/transform_conversions.c
    branches/projection-paint/source/blender/src/transform_generics.c
    branches/projection-paint/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/projection-paint/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/projection-paint/source/gameengine/VideoTexture/ImageRender.cpp
    branches/projection-paint/source/gameengine/VideoTexture/Texture.cpp
    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
    branches/projection-paint/tools/Blender.py
    branches/projection-paint/tools/btools.py

Added Paths:
-----------
    branches/projection-paint/extern/bFTGL/make/msvc_9_0/
    branches/projection-paint/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj
    branches/projection-paint/extern/bullet2/make/msvc_9_0/
    branches/projection-paint/extern/bullet2/make/msvc_9_0/Bullet.vcproj
    branches/projection-paint/extern/glew/make/msvc_9_0/
    branches/projection-paint/extern/glew/make/msvc_9_0/glew.vcproj
    branches/projection-paint/extern/make/msvc_9_0/
    branches/projection-paint/extern/make/msvc_9_0/build_install_all.vcproj
    branches/projection-paint/extern/qhull/make/msvc_9_0/
    branches/projection-paint/extern/qhull/make/msvc_9_0/qhull.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/
    branches/projection-paint/extern/solid/make/msvc_9_0/broad/
    branches/projection-paint/extern/solid/make/msvc_9_0/broad/broad.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/complex/
    branches/projection-paint/extern/solid/make/msvc_9_0/complex/complex.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/convex/
    branches/projection-paint/extern/solid/make/msvc_9_0/convex/convex.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/solid.vcproj
    branches/projection-paint/extern/verse/make/msvc_9_0/
    branches/projection-paint/extern/verse/make/msvc_9_0/libverse.vcproj
    branches/projection-paint/extern/verse/make/msvc_9_0/verse.vcproj
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/dummy/
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/openal/
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj
    branches/projection-paint/intern/bmfont/make/msvc_9_0/
    branches/projection-paint/intern/bmfont/make/msvc_9_0/bmfont.vcproj
    branches/projection-paint/intern/boolop/make/msvc_9_0/
    branches/projection-paint/intern/boolop/make/msvc_9_0/boolop.vcproj
    branches/projection-paint/intern/bsp/make/msvc_9_0/
    branches/projection-paint/intern/bsp/make/msvc_9_0/bsplib.vcproj
    branches/projection-paint/intern/container/make/msvc_9_0/
    branches/projection-paint/intern/container/make/msvc_9_0/container.vcproj
    branches/projection-paint/intern/decimation/make/msvc_9_0/
    branches/projection-paint/intern/decimation/make/msvc_9_0/decimation.vcproj
    branches/projection-paint/intern/elbeem/make/msvc_9_0/
    branches/projection-paint/intern/elbeem/make/msvc_9_0/elbeem.vcproj
    branches/projection-paint/intern/ghost/make/msvc_9_0/
    branches/projection-paint/intern/ghost/make/msvc_9_0/ghost.vcproj
    branches/projection-paint/intern/guardedalloc/make/msvc_9_0/
    branches/projection-paint/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj
    branches/projection-paint/intern/iksolver/make/msvc_9_0/
    branches/projection-paint/intern/iksolver/make/msvc_9_0/iksolver.vcproj
    branches/projection-paint/intern/make/msvc_9_0/
    branches/projection-paint/intern/make/msvc_9_0/INT_build_install_all.vcproj
    branches/projection-paint/intern/memutil/make/msvc_9_0/
    branches/projection-paint/intern/memutil/make/msvc_9_0/memutil.vcproj
    branches/projection-paint/intern/moto/make/msvc_9_0/
    branches/projection-paint/intern/moto/make/msvc_9_0/moto.vcproj
    branches/projection-paint/intern/opennl/make/msvc_9_0/
    branches/projection-paint/intern/opennl/make/msvc_9_0/opennl.vcproj
    branches/projection-paint/intern/string/make/msvc_9_0/
    branches/projection-paint/intern/string/make/msvc_9_0/string.vcproj
    branches/projection-paint/projectfiles_vc7/gameengine/videotexture/
    branches/projection-paint/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj
    branches/projection-paint/projectfiles_vc9/
    branches/projection-paint/projectfiles_vc9/blender/
    branches/projection-paint/projectfiles_vc9/blender/BLO_readblenfile/
    branches/projection-paint/projectfiles_vc9/blender/BLO_readblenfile/BLO_readblenfile.vcproj
    branches/projection-paint/projectfiles_vc9/blender/BPY_python/
    branches/projection-paint/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/projection-paint/projectfiles_vc9/blender/avi/
    branches/projection-paint/projectfiles_vc9/blender/avi/BL_avi.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blender.sln
    branches/projection-paint/projectfiles_vc9/blender/blender.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blenkernel/
    branches/projection-paint/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blenlib/
    branches/projection-paint/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blenpluginapi/
    branches/projection-paint/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/
    branches/projection-paint/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
    branches/projection-paint/projectfiles_vc9/blender/ftfont/
    branches/projection-paint/projectfiles_vc9/blender/ftfont/FTF_ftfont.vcproj
    branches/projection-paint/projectfiles_vc9/blender/gpu/
    branches/projection-paint/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/projection-paint/projectfiles_vc9/blender/imbuf/
    branches/projection-paint/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/projection-paint/projectfiles_vc9/blender/img/
    branches/projection-paint/projectfiles_vc9/blender/img/BL_img.vcproj
    branches/projection-paint/projectfiles_vc9/blender/loader/
    branches/projection-paint/projectfiles_vc9/blender/loader/BLO_loader.vcproj
    branches/projection-paint/projectfiles_vc9/blender/makesdna/
    branches/projection-paint/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
    branches/projection-paint/projectfiles_vc9/blender/nodes/
    branches/projection-paint/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/projection-paint/projectfiles_vc9/blender/radiosity/
    branches/projection-paint/projectfiles_vc9/blender/radiosity/BRA_radiosity.vcproj
    branches/projection-paint/projectfiles_vc9/blender/render/
    branches/projection-paint/projectfiles_vc9/blender/render/BRE_render.vcproj
    branches/projection-paint/projectfiles_vc9/blender/renderconverter/
    branches/projection-paint/projectfiles_vc9/blender/renderconverter/BRE_renderconverter.vcproj
    branches/projection-paint/projectfiles_vc9/blender/src/
    branches/projection-paint/projectfiles_vc9/blender/src/BL_src.vcproj
    branches/projection-paint/projectfiles_vc9/blender/yafray/
    branches/projection-paint/projectfiles_vc9/blender/yafray/BRE_yafray.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/
    branches/projection-paint/projectfiles_vc9/gameengine/blenderhook/
    branches/projection-paint/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/converter/
    branches/projection-paint/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/expression/
    branches/projection-paint/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gamelogic/
    branches/projection-paint/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/axctl/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/common/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/ghost/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/network/
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/network/
    branches/projection-paint/projectfiles_vc9/gameengine/network/loopbacknetwork/
    branches/projection-paint/projectfiles_vc9/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/network/network/
    branches/projection-paint/projectfiles_vc9/gameengine/network/network/NG_network.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/scenegraph/
    branches/projection-paint/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/videotexture/
    branches/projection-paint/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/projection-paint/projectfiles_vc9/kernel/
    branches/projection-paint/projectfiles_vc9/kernel/gen_messaging/
    branches/projection-paint/projectfiles_vc9/kernel/gen_messaging/gen_messaging.vcproj
    branches/projection-paint/projectfiles_vc9/kernel/system/
    branches/projection-paint/projectfiles_vc9/kernel/system/SYS_system.vcproj
    branches/projection-paint/projectfiles_vc9/sumo/

Removed Paths:
-------------
    branches/projection-paint/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj
    branches/projection-paint/extern/bullet2/make/msvc_9_0/Bullet.vcproj
    branches/projection-paint/extern/glew/make/msvc_9_0/glew.vcproj
    branches/projection-paint/extern/make/msvc_9_0/build_install_all.vcproj
    branches/projection-paint/extern/qhull/make/msvc_9_0/qhull.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/broad/
    branches/projection-paint/extern/solid/make/msvc_9_0/broad/broad.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/complex/
    branches/projection-paint/extern/solid/make/msvc_9_0/complex/complex.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/convex/
    branches/projection-paint/extern/solid/make/msvc_9_0/convex/convex.vcproj
    branches/projection-paint/extern/solid/make/msvc_9_0/solid.vcproj
    branches/projection-paint/extern/verse/make/msvc_9_0/libverse.vcproj
    branches/projection-paint/extern/verse/make/msvc_9_0/verse.vcproj
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/dummy/
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/openal/
    branches/projection-paint/intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj
    branches/projection-paint/intern/bmfont/make/msvc_9_0/bmfont.vcproj
    branches/projection-paint/intern/boolop/make/msvc_9_0/boolop.vcproj
    branches/projection-paint/intern/bsp/make/msvc_9_0/bsplib.vcproj
    branches/projection-paint/intern/container/make/msvc_9_0/container.vcproj
    branches/projection-paint/intern/decimation/make/msvc_9_0/decimation.vcproj
    branches/projection-paint/intern/elbeem/make/msvc_9_0/elbeem.vcproj
    branches/projection-paint/intern/ghost/make/msvc_9_0/ghost.vcproj
    branches/projection-paint/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj
    branches/projection-paint/intern/iksolver/make/msvc_9_0/iksolver.vcproj
    branches/projection-paint/intern/make/msvc_9_0/INT_build_install_all.vcproj
    branches/projection-paint/intern/memutil/make/msvc_9_0/memutil.vcproj
    branches/projection-paint/intern/moto/make/msvc_9_0/moto.vcproj
    branches/projection-paint/intern/opennl/make/msvc_9_0/opennl.vcproj
    branches/projection-paint/intern/string/make/msvc_9_0/string.vcproj
    branches/projection-paint/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj
    branches/projection-paint/projectfiles_vc9/blender/
    branches/projection-paint/projectfiles_vc9/blender/BLO_readblenfile/
    branches/projection-paint/projectfiles_vc9/blender/BLO_readblenfile/BLO_readblenfile.vcproj
    branches/projection-paint/projectfiles_vc9/blender/BPY_python/
    branches/projection-paint/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/projection-paint/projectfiles_vc9/blender/avi/
    branches/projection-paint/projectfiles_vc9/blender/avi/BL_avi.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blender.sln
    branches/projection-paint/projectfiles_vc9/blender/blender.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blenkernel/
    branches/projection-paint/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blenlib/
    branches/projection-paint/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/projection-paint/projectfiles_vc9/blender/blenpluginapi/
    branches/projection-paint/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/
    branches/projection-paint/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
    branches/projection-paint/projectfiles_vc9/blender/ftfont/
    branches/projection-paint/projectfiles_vc9/blender/ftfont/FTF_ftfont.vcproj
    branches/projection-paint/projectfiles_vc9/blender/gpu/
    branches/projection-paint/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/projection-paint/projectfiles_vc9/blender/imbuf/
    branches/projection-paint/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/projection-paint/projectfiles_vc9/blender/img/
    branches/projection-paint/projectfiles_vc9/blender/img/BL_img.vcproj
    branches/projection-paint/projectfiles_vc9/blender/loader/
    branches/projection-paint/projectfiles_vc9/blender/loader/BLO_loader.vcproj
    branches/projection-paint/projectfiles_vc9/blender/makesdna/
    branches/projection-paint/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
    branches/projection-paint/projectfiles_vc9/blender/nodes/
    branches/projection-paint/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/projection-paint/projectfiles_vc9/blender/radiosity/
    branches/projection-paint/projectfiles_vc9/blender/radiosity/BRA_radiosity.vcproj
    branches/projection-paint/projectfiles_vc9/blender/render/
    branches/projection-paint/projectfiles_vc9/blender/render/BRE_render.vcproj
    branches/projection-paint/projectfiles_vc9/blender/renderconverter/
    branches/projection-paint/projectfiles_vc9/blender/renderconverter/BRE_renderconverter.vcproj
    branches/projection-paint/projectfiles_vc9/blender/src/
    branches/projection-paint/projectfiles_vc9/blender/src/BL_src.vcproj
    branches/projection-paint/projectfiles_vc9/blender/yafray/
    branches/projection-paint/projectfiles_vc9/blender/yafray/BRE_yafray.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/
    branches/projection-paint/projectfiles_vc9/gameengine/blenderhook/
    branches/projection-paint/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/converter/
    branches/projection-paint/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/expression/
    branches/projection-paint/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gamelogic/
    branches/projection-paint/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/axctl/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/common/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/ghost/
    branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/network/
    branches/projection-paint/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/network/
    branches/projection-paint/projectfiles_vc9/gameengine/network/loopbacknetwork/
    branches/projection-paint/projectfiles_vc9/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/network/network/
    branches/projection-paint/projectfiles_vc9/gameengine/network/network/NG_network.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/
    branches/projection-paint/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/
    branches/projection-paint/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/scenegraph/
    branches/projection-paint/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj
    branches/projection-paint/projectfiles_vc9/gameengine/videotexture/
    branches/projection-paint/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/projection-paint/projectfiles_vc9/kernel/
    branches/projection-paint/projectfiles_vc9/kernel/gen_messaging/
    branches/projection-paint/projectfiles_vc9/kernel/gen_messaging/gen_messaging.vcproj
    branches/projection-paint/projectfiles_vc9/kernel/system/
    branches/projection-paint/projectfiles_vc9/kernel/system/SYS_system.vcproj
    branches/projection-paint/projectfiles_vc9/sumo/

Modified: branches/projection-paint/SConstruct
===================================================================
--- branches/projection-paint/SConstruct	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/SConstruct	2008-11-11 12:56:57 UTC (rev 17405)
@@ -227,7 +227,7 @@
             context.Result(result)
             return result
 
-        env2 = env.Copy( LIBPATH = env['BF_OPENAL'] ) 
+        env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) 
         sconf_temp = mkdtemp()
         conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' )
         if conf.CheckFreeAlut( env2 ):

Modified: branches/projection-paint/config/darwin-config.py
===================================================================
--- branches/projection-paint/config/darwin-config.py	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/config/darwin-config.py	2008-11-11 12:56:57 UTC (rev 17405)
@@ -260,11 +260,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ['-pg', '-g ']
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR='../build/darwin'
 BF_INSTALLDIR='../install/darwin'

Modified: branches/projection-paint/config/linux2-config.py
===================================================================
--- branches/projection-paint/config/linux2-config.py	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/config/linux2-config.py	2008-11-11 12:56:57 UTC (rev 17405)
@@ -197,11 +197,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ['-pg','-g']
 BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR = '../build/linux2'
 BF_INSTALLDIR='../install/linux2'

Modified: branches/projection-paint/config/linuxcross-config.py
===================================================================
--- branches/projection-paint/config/linuxcross-config.py	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/config/linuxcross-config.py	2008-11-11 12:56:57 UTC (rev 17405)
@@ -144,7 +144,7 @@
 LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS= []
+BF_DEBUG_CCFLAGS= []
 
 BF_BUILDDIR = '../build/linuxcross'
 BF_INSTALLDIR='../install/linuxcross'

Modified: branches/projection-paint/config/openbsd3-config.py
===================================================================
--- branches/projection-paint/config/openbsd3-config.py	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/config/openbsd3-config.py	2008-11-11 12:56:57 UTC (rev 17405)
@@ -155,11 +155,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ['-pg', '-g']
+BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR='../build/openbsd3'
 BF_INSTALLDIR='../install/openbsd3'

Modified: branches/projection-paint/config/sunos5-config.py
===================================================================
--- branches/projection-paint/config/sunos5-config.py	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/config/sunos5-config.py	2008-11-11 12:56:57 UTC (rev 17405)
@@ -169,11 +169,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg','-g']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = []
+BF_DEBUG_CCFLAGS = []
 
 BF_BUILDDIR = '../build/sunos5'
 BF_INSTALLDIR='../install/sunos5'

Modified: branches/projection-paint/config/win32-mingw-config.py
===================================================================
--- branches/projection-paint/config/win32-mingw-config.py	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/config/win32-mingw-config.py	2008-11-11 12:56:57 UTC (rev 17405)
@@ -160,9 +160,9 @@
 LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS= ['-g']
+BF_DEBUG_CCFLAGS= ['-g']
 
-BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg','-g']
 BF_PROFILE = False
 
 BF_BUILDDIR = '..\\build\\win32-mingw'

Modified: branches/projection-paint/doc/blender-scons.txt
===================================================================
--- branches/projection-paint/doc/blender-scons.txt	2008-11-11 12:35:52 UTC (rev 17404)
+++ branches/projection-paint/doc/blender-scons.txt	2008-11-11 12:56:57 UTC (rev 17405)
@@ -26,8 +26,9 @@
     ----------------
 
     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 v1.1.0 (http://www.scons.org).
+    install, version 2.4 or later (http://www.python.org). We already provide
+    a scons-local installation, which can be found in the scons/ subdirectory.
+    This document uses the scons-local installation for its examples.
 
     Check from the page
     http://www.blender.org/development/building-blender/getting-dependencies/
@@ -38,10 +39,15 @@
     In the base directory of the sources (from now on called $BLENDERHOME)
     you'll see a file named SConstruct. This is the entry point for the
     SCons build system. In a terminal, change to this directory. To just
-    build, issue the command 'scons':
+    build, start the SCons entry script on Windows (will be used for the remainder
+    of this document):
 
-        % scons
+        % python scons\scons.py
 
+    On a Unix-compatible system it would be
+
+        % python ./scons/scons.py
+
     This will start the build process with default values. Depending
     on your platform you may see colour in your output (non-Windows
     machines). In the the beginning an overview of targets and arguments
@@ -49,8 +55,9 @@
     build are configured.
 
     The build uses BF_BUILDDIR to build into and BF_INSTALLDIR to
-    finally copy all needed files to get a proper setup. These
-    variabbles have default values for every platform in
+    finally copy all needed files to get a proper setup. The BF_DOCDIR is
+    used to generate Blender Python documentation files to. These
+    variables have default values for every platform in
     $BLENDERHOME/config/(platform)-config.py. After the build successfully
     completes, you can find everything you need in BF_INSTALLDIR.
 
@@ -59,7 +66,7 @@
     As an extra dependency, you need the MoreInfo plugin too. The creation of
     the installer is tied into the build process and can be triggered with:
 
-        % scons nsis
+        % python scons\scons.py nsis
 
 
     Configuring the build
@@ -76,20 +83,21 @@
         (TBD: add cygwin, solaris and freebsd support)
 
     These files you will normally not change. If you need to override
-    a default value, make a copy of the proper configuration to
-    $BLENDERHOME/user-config.py. This file you can modify to your
-    likings. Any value set here will override the ones from the
-    (platform)-config.py.
+    a default value, make a file called  $BLENDERHOME/user-config.py, and copy
+    settings from the config/(platform)-config.py that you want to change. Don't
+    copy the entire file (unless explicitely stated in the configuration file),
+    because you may not get updated options you don't change yourself, which may
+    result in build errors.
 
     You can use BF_CONFIG argument to override the default user-config.py
     check. This is just like the user-config.py, but just with another name:
 
-        % scons BF_CONFIG=myownsettings
+        % python scons\scons.py BF_CONFIG=myownsettings
 
     If you want to quickly test a new setting, you can give the option
     also on the command-line:
 
-        % scons BF_BUILDDIR=../mybuilddir WITH_BF_OPENEXR=0
+        % python scons\scons.py BF_BUILDDIR=../mybuilddir WITH_BF_OPENEXR=0
 
     This command sets the build directory to BF_BUILDDIR and disables
     OpenEXR support.
@@ -97,7 +105,7 @@
     If you need to know what can be set through the command-line, run
     scons with -h:
 
-        % scons -h
+        % python scons\scons.py -h
 
     This command will print a long list with settable options and what
     every option means. Many of the default values will be empty, and
@@ -118,11 +126,11 @@
     you need to see the full command-line for compiles, then you can
     change that behaviour. Also the use of colours can be changed:
 
-        % scons BF_FANCY=0
+        % python scons\scons.py BF_FANCY=0
 
     This will disable the use of colours.
 
-        % scons BF_QUIET=0
+        % python scons\scons.py BF_QUIET=0
 
     This will give the old, noisy output. Every command-line per
     compile is printed out in its full glory. This is very useful when
@@ -133,11 +141,11 @@
     Compiling Only Some Libraries
     -----------------------------
     
-    Scons now has support for specifying a list of libraries that are
+    Our implementation now has support for specifying a list of libraries that are
     exclusively compiled, ignoring all other libraries.  This is invoked 
     with the BF_QUICK arguments; for example:
     
-        % scons BF_QUICK=src,bf_blenkernel
+        % python scons\scons.py BF_QUICK=src,bf_blenkernel
     
     Note that this not the same as passing a list of folders as in the 
     makefile's "quicky" command.  In Scons, all of Blender's code modules
@@ -157,7 +165,7 @@
     
     BF_QUICKDEBUG is similar to BF_QUICK:
     
-        % scons BF_QUICKDEBUG=src,bf_blenkernel,some-other-lib
+        % python scons\scons.py BF_QUICKDEBUG=src,bf_blenkernel,some-other-lib
     
     To use BF_DEBUG_LIBS, put something like the following in you user-config.py:
     
@@ -184,15 +192,9 @@
     On Windows with all of the three toolset installed you need to
     specify what toolset to use
 
-        % scons BF_TOOLSET=msvc
-        % scons BF_TOOLSET=mingw
+        % python scons\scons.py BF_TOOLSET=msvc
+        % python scons\scons.py BF_TOOLSET=mingw
 
-    If you have only the toolkit installed, you will also need to give
-    BF_TOOLSET=mstoolkit on the command-line, to make sure everything is
-    setup properly. Currently there is no good mechanism to automatically

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list