2nd try to merge sim_physics with trunk rev 19825
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 21 Apr 2009 08:49:06 +0000 (08:49 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 21 Apr 2009 08:49:06 +0000 (08:49 +0000)
commitcf9886b0d0cd945c05f4e41173604c6663415797
tree95e71b06d9f0dd406b07027b5b57c08eaa45113e
parent8a0a557294b61f67cdfc36c2c4163b3a88f71689
parent2d0d06f642b661b084657c05ebb0c664f998a937
2nd try to merge sim_physics with trunk rev 19825
Please check if volumetrics are yet working
290 files changed:
extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj
extern/bullet2/make/msvc_9_0/Bullet.vcproj
extern/glew/make/msvc_7_0/glew_vc7.vcproj
extern/glew/make/msvc_9_0/glew.vcproj
extern/make/msvc_9_0/build_install_all.vcproj
extern/qhull/make/msvc_9_0/qhull.vcproj
extern/solid/make/msvc_9_0/broad/broad.vcproj
extern/solid/make/msvc_9_0/complex/complex.vcproj
extern/solid/make/msvc_9_0/convex/convex.vcproj
extern/solid/make/msvc_9_0/solid.vcproj
extern/verse/make/msvc_9_0/libverse.vcproj
extern/verse/make/msvc_9_0/verse.vcproj
intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp
intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp
intern/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp
intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj
intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj
intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj
intern/bmfont/make/msvc_6_0/bmfont.dsp
intern/bmfont/make/msvc_6_0/bmfont.dsw
intern/bmfont/make/msvc_9_0/bmfont.vcproj
intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp
intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw
intern/boolop/intern/BOP_Merge2.cpp
intern/boolop/intern/BOP_Misc.h
intern/boolop/make/msvc_6_0/boolop.dsp
intern/boolop/make/msvc_9_0/boolop.vcproj
intern/bsp/make/msvc6_0/bsplib.dsp
intern/bsp/make/msvc6_0/bsplib.dsw
intern/bsp/make/msvc_9_0/bsplib.vcproj
intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
intern/container/make/msvc_6_0/container.dsp
intern/container/make/msvc_6_0/container.dsw
intern/container/make/msvc_9_0/container.vcproj
intern/decimation/make/msvc_6_0/decimation.dsp
intern/decimation/make/msvc_6_0/decimation.dsw
intern/decimation/make/msvc_9_0/decimation.vcproj
intern/elbeem/make/msvc_6_0/elbeem.dsp
intern/elbeem/make/msvc_9_0/elbeem.vcproj
intern/ghost/make/msvc/ghost.dsp
intern/ghost/make/msvc/ghost.dsw
intern/ghost/make/msvc_9_0/ghost.vcproj
intern/ghost/test/make/msvc_6_0/gears.dsp
intern/ghost/test/make/msvc_6_0/gears_C.dsp
intern/ghost/test/make/msvc_6_0/ghost_test.dsw
intern/guardedalloc/BLO_sys_types.h
intern/guardedalloc/intern/mmap_win.c
intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj
intern/guardedalloc/mmap_win.h
intern/iksolver/make/msvc_6_0/iksolver.dsp
intern/iksolver/make/msvc_6_0/iksolver.dsw
intern/iksolver/make/msvc_9_0/iksolver.vcproj
intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp
intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw
intern/make/msvc_6_0/build_install_all.dsp
intern/make/msvc_6_0/intern.dsw
intern/make/msvc_9_0/INT_build_install_all.vcproj
intern/memutil/make/msvc_60/memutil.dsp
intern/memutil/make/msvc_60/memutil.dsw
intern/memutil/make/msvc_9_0/memutil.vcproj
intern/moto/make/msvc_6_0/MoTo.dsp
intern/moto/make/msvc_6_0/MoTo.dsw
intern/moto/make/msvc_9_0/moto.vcproj
intern/opennl/make/msvc_6_0/OpenNL.dsp
intern/opennl/make/msvc_6_0/OpenNL.dsw
intern/opennl/make/msvc_9_0/opennl.vcproj
intern/opennl/superlu/BLO_sys_types.h
intern/string/make/msvc_6_0/string.dsp
intern/string/make/msvc_6_0/string.dsw
intern/string/make/msvc_9_0/string.vcproj
projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
projectfiles/blender/BPY_python/BPY_python.dsp
projectfiles/blender/avi/BL_avi.dsp
projectfiles/blender/blender.dsp
projectfiles/blender/blender.dsw
projectfiles/blender/blenkernel/BKE_blenkernel.dsp
projectfiles/blender/blenlib/BLI_blenlib.dsp
projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp
projectfiles/blender/ftfont/FTF_ftfont.dsp
projectfiles/blender/glut/BL_glut.dsp
projectfiles/blender/imbuf/BL_imbuf.dsp
projectfiles/blender/img/BL_img.dsp
projectfiles/blender/loader/BLO_loader.dsp
projectfiles/blender/makesdna/DNA_makesdna.dsp
projectfiles/blender/radiosity/BRA_radiosity.dsp
projectfiles/blender/render/BRE_render.dsp
projectfiles/blender/renderconverter/BRE_renderconverter.dsp
projectfiles/blender/src/BL_src.dsp
projectfiles/blender/src/BL_src_cre.dsp
projectfiles/blender/yafray/BRE_yafray.dsp
projectfiles/datatoc/datatoc.dsp
projectfiles/gameengine/blenderhook/KX_blenderhook.dsp
projectfiles/gameengine/converter/KX_converter.dsp
projectfiles/gameengine/expression/EXP_expressions.dsp
projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp
projectfiles/gameengine/gameplayer/common/GP_common.dsp
projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
projectfiles/gameengine/gameplayer/glut/GP_glut.dsp
projectfiles/gameengine/gameplayer/loader/BlenderLoader/BlenderLoader.dsp
projectfiles/gameengine/gameplayer/netscape/GP_netscape.dsp
projectfiles/gameengine/gameplayer/netscape2/GP_netscape.dsp
projectfiles/gameengine/gameplayer/ps2/GP_ps2.dsp
projectfiles/gameengine/gameplayer/qt/gp.dsp
projectfiles/gameengine/gameplayer/qt/gpplugin.dsp
projectfiles/gameengine/gameplayer/qt/qtgp.dsw
projectfiles/gameengine/gameplayer/sdl/GP_sdl.dsp
projectfiles/gameengine/ketsji/KX_ketsji.dsp
projectfiles/gameengine/ketsji/network/KX_network.dsp
projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp
projectfiles/gameengine/network/network/NG_network.dsp
projectfiles/gameengine/network/terraplaynetwork/NG_terraplaynetwork.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp
projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.dsp
projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp
projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp
projectfiles/gameengine/scenegraph/SG_scenegraph.dsp
projectfiles/kernel/gen_messaging/gen_messaging.dsp
projectfiles/kernel/system/SYS_system.dsp
projectfiles/sumo/fuzzics/SM_fuzzics.dsp
projectfiles/sumo/moto/SM_moto.dsp
projectfiles/sumo/solid/SM_solid.dsp
projectfiles_vc7/blender/gpu/BL_gpu.vcproj
projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj
projectfiles_vc7/sumo/moto/SM_moto.dsp
projectfiles_vc7/sumo/solid/SM_solid.dsp
projectfiles_vc9/blender/BLO_readblenfile/BLO_readblenfile.vcproj
projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
projectfiles_vc9/blender/avi/BL_avi.vcproj
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/blender.vcproj
projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
projectfiles_vc9/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj
projectfiles_vc9/blender/ftfont/FTF_ftfont.vcproj
projectfiles_vc9/blender/gpu/BL_gpu.vcproj
projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
projectfiles_vc9/blender/img/BL_img.vcproj
projectfiles_vc9/blender/loader/BLO_loader.vcproj
projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
projectfiles_vc9/blender/nodes/nodes.vcproj
projectfiles_vc9/blender/radiosity/BRA_radiosity.vcproj
projectfiles_vc9/blender/render/BRE_render.vcproj
projectfiles_vc9/blender/renderconverter/BRE_renderconverter.vcproj
projectfiles_vc9/blender/src/BL_src.vcproj
projectfiles_vc9/blender/yafray/BRE_yafray.vcproj
projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
projectfiles_vc9/gameengine/converter/KX_converter.vcproj
projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj
projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
projectfiles_vc9/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj
projectfiles_vc9/gameengine/network/network/NG_network.vcproj
projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj
projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj
projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj
projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj
projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
projectfiles_vc9/kernel/gen_messaging/gen_messaging.vcproj
projectfiles_vc9/kernel/system/SYS_system.vcproj
release/datafiles/.Bfs
release/scripts/export_m3g.py
release/scripts/import_lightwave_motion.py
source/blender/blenkernel/BKE_bmesh.h
source/blender/blenkernel/BKE_bmeshCustomData.h
source/blender/blenkernel/BKE_bvhutils.h
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/BKE_collision.h
source/blender/blenkernel/BKE_multires.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/BKE_sculpt.h
source/blender/blenkernel/BKE_suggestions.h
source/blender/blenkernel/intern/BME_Customdata.c
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/BME_eulers.c
source/blender/blenkernel/intern/BME_mesh.c
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/bmesh_private.h
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/suggestions.c
source/blender/blenkernel/intern/verse_method.c
source/blender/blenlib/BLI_kdopbvh.h
source/blender/blenlib/BLI_kdtree.h
source/blender/blenlib/intern/BLI_kdtree.c
source/blender/gpu/GPU_draw.h
source/blender/gpu/GPU_extensions.h
source/blender/gpu/GPU_material.h
source/blender/gpu/Makefile
source/blender/gpu/intern/Makefile
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_codegen.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_material.c
source/blender/imbuf/intern/IMB_jp2.h
source/blender/imbuf/intern/dds/BlockDXT.cpp
source/blender/imbuf/intern/dds/BlockDXT.h
source/blender/imbuf/intern/dds/Color.h
source/blender/imbuf/intern/dds/ColorBlock.cpp
source/blender/imbuf/intern/dds/ColorBlock.h
source/blender/imbuf/intern/dds/Common.h
source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
source/blender/imbuf/intern/dds/DirectDrawSurface.h
source/blender/imbuf/intern/dds/Image.cpp
source/blender/imbuf/intern/dds/Image.h
source/blender/imbuf/intern/dds/Makefile
source/blender/imbuf/intern/dds/PixelFormat.h
source/blender/imbuf/intern/dds/Stream.cpp
source/blender/imbuf/intern/dds/Stream.h
source/blender/imbuf/intern/dds/dds_api.cpp
source/blender/imbuf/intern/dds/dds_api.h
source/blender/include/BIF_editparticle.h
source/blender/include/BIF_meshlaplacian.h
source/blender/include/BIF_radialcontrol.h
source/blender/include/BSE_editaction_types.h
source/blender/makesdna/DNA_cloth_types.h
source/blender/makesdna/DNA_particle_types.h
source/blender/nodes/TEX_node.h
source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
source/blender/nodes/intern/SHD_nodes/SHD_invert.c
source/blender/nodes/intern/TEX_nodes/Makefile
source/blender/nodes/intern/TEX_nodes/TEX_image.c
source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
source/blender/python/api2_2x/doc/Particle.py
source/blender/python/api2_2x/doc/epy_docgen.sh
source/blender/render/extern/include/RE_raytrace.h
source/blender/render/intern/include/occlusion.h
source/blender/render/intern/include/strand.h
source/blender/render/intern/include/voxeldata.h
source/blender/render/intern/source/occlusion.c
source/blender/render/intern/source/raytrace.c
source/blender/render/intern/source/strand.c
source/blender/src/editparticle.c
source/blender/src/meshlaplacian.c
source/blender/src/radialcontrol.c
source/blender/src/sculptmode-stroke.c
source/darwin/Makefile
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.h
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
source/gameengine/GameLogic/SCA_2DFilterActuator.h
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_RandomActuator.cpp
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/Ketsji/BL_Shader.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_ParentActuator.h
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Ketsji/KX_PyMath.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_VertexProxy.cpp
source/gameengine/PyDoc/BL_ShapeActionActuator.py
source/gameengine/PyDoc/KX_ParentActuator.py
source/gameengine/PyDoc/KX_StateActuator.py
source/gameengine/PyDoc/SCA_DelaySensor.py
source/gameengine/PyDoc/SCA_JoystickSensor.py
source/gameengine/PyDoc/epy_docgen.sh
source/gameengine/VideoTexture/FilterNormal.cpp
source/gameengine/VideoTexture/blendVideoTex.cpp