[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16750] branches/soc-2008-jaguarandi: svn merge -r 16608:16749 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

André Pinto andresusanopinto at gmail.com
Fri Sep 26 20:53:27 CEST 2008


Revision: 16750
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16750
Author:   jaguarandi
Date:     2008-09-26 20:53:26 +0200 (Fri, 26 Sep 2008)

Log Message:
-----------
svn merge -r 16608:16749 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2008-jaguarandi/SConstruct
    branches/soc-2008-jaguarandi/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/soc-2008-jaguarandi/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
    branches/soc-2008-jaguarandi/extern/bullet2/CMakeLists.txt
    branches/soc-2008-jaguarandi/extern/bullet2/Makefile
    branches/soc-2008-jaguarandi/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/LinearMath/btConvexHull.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/LinearMath/btConvexHull.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/Makefile
    branches/soc-2008-jaguarandi/extern/bullet2/src/SConscript
    branches/soc-2008-jaguarandi/intern/SoundSystem/SConscript
    branches/soc-2008-jaguarandi/intern/SoundSystem/intern/SND_Utils.cpp
    branches/soc-2008-jaguarandi/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/CMakeLists.txt
    branches/soc-2008-jaguarandi/intern/elbeem/SConscript
    branches/soc-2008-jaguarandi/intern/elbeem/extern/LBM_fluidsim.h
    branches/soc-2008-jaguarandi/intern/elbeem/extern/elbeem.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/elbeem.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/isosurface.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/ntl_geometryclass.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/ntl_geometryobject.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/ntl_geometryobject.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/ntl_ray.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/ntl_ray.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/ntl_world.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/simulation_object.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_adap.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_class.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_init.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_main.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_relax.h
    branches/soc-2008-jaguarandi/intern/elbeem/make/msvc_7_0/elbeem.vcproj
    branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2008-jaguarandi/po/fr.po
    branches/soc-2008-jaguarandi/po/kr.po
    branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
    branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/soc-2008-jaguarandi/release/datafiles/preview.blend
    branches/soc-2008-jaguarandi/release/plugins/sequence/dnr.c
    branches/soc-2008-jaguarandi/release/scripts/animation_bake_constraints.py
    branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/collada.py
    branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/translator.py
    branches/soc-2008-jaguarandi/release/scripts/console.py
    branches/soc-2008-jaguarandi/release/scripts/hotkeys.py
    branches/soc-2008-jaguarandi/release/scripts/import_obj.py
    branches/soc-2008-jaguarandi/release/text/blender.html
    branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_curve.h
    branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_property.h
    branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/action.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/object.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/property.c
    branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_arithb.h
    branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_blenlib.h
    branches/soc-2008-jaguarandi/source/blender/blenlib/intern/arithb.c
    branches/soc-2008-jaguarandi/source/blender/blenlib/intern/dynlib.c
    branches/soc-2008-jaguarandi/source/blender/blenlib/intern/edgehash.c
    branches/soc-2008-jaguarandi/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2008-jaguarandi/source/blender/blenlib/intern/util.c
    branches/soc-2008-jaguarandi/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-jaguarandi/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-jaguarandi/source/blender/gpu/GPU_extensions.h
    branches/soc-2008-jaguarandi/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-jaguarandi/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-jaguarandi/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-jaguarandi/source/blender/imbuf/intern/divers.c
    branches/soc-2008-jaguarandi/source/blender/imbuf/intern/rectop.c
    branches/soc-2008-jaguarandi/source/blender/include/BIF_editarmature.h
    branches/soc-2008-jaguarandi/source/blender/include/BIF_editseq.h
    branches/soc-2008-jaguarandi/source/blender/include/BIF_outliner.h
    branches/soc-2008-jaguarandi/source/blender/include/blendef.h
    branches/soc-2008-jaguarandi/source/blender/include/butspace.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_ipo_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_material_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-jaguarandi/source/blender/python/BPY_extern.h
    branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Camera.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Lamp.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Material.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Object.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Pose.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Scene.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Text.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/World.c
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/API_intro.py
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/API_related.py
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Blender.py
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Object.py
    branches/soc-2008-jaguarandi/source/blender/python/api2_2x/sceneRender.c
    branches/soc-2008-jaguarandi/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-jaguarandi/source/blender/render/intern/include/render_types.h
    branches/soc-2008-jaguarandi/source/blender/render/intern/include/sunsky.h
    branches/soc-2008-jaguarandi/source/blender/render/intern/include/texture.h
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/pixelshading.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/sunsky.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/texture.c
    branches/soc-2008-jaguarandi/source/blender/render/intern/source/zbuf.c
    branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
    branches/soc-2008-jaguarandi/source/blender/src/buttons_logic.c
    branches/soc-2008-jaguarandi/source/blender/src/buttons_object.c
    branches/soc-2008-jaguarandi/source/blender/src/buttons_scene.c
    branches/soc-2008-jaguarandi/source/blender/src/buttons_shading.c
    branches/soc-2008-jaguarandi/source/blender/src/drawaction.c
    branches/soc-2008-jaguarandi/source/blender/src/drawipo.c
    branches/soc-2008-jaguarandi/source/blender/src/drawmesh.c
    branches/soc-2008-jaguarandi/source/blender/src/drawnode.c
    branches/soc-2008-jaguarandi/source/blender/src/drawobject.c
    branches/soc-2008-jaguarandi/source/blender/src/drawtext.c
    branches/soc-2008-jaguarandi/source/blender/src/drawview.c
    branches/soc-2008-jaguarandi/source/blender/src/editarmature.c
    branches/soc-2008-jaguarandi/source/blender/src/editcurve.c
    branches/soc-2008-jaguarandi/source/blender/src/editimasel.c
    branches/soc-2008-jaguarandi/source/blender/src/editipo.c
    branches/soc-2008-jaguarandi/source/blender/src/editipo_lib.c
    branches/soc-2008-jaguarandi/source/blender/src/editipo_mods.c
    branches/soc-2008-jaguarandi/source/blender/src/editmesh.c
    branches/soc-2008-jaguarandi/source/blender/src/editmesh_tools.c
    branches/soc-2008-jaguarandi/source/blender/src/editobject.c
    branches/soc-2008-jaguarandi/source/blender/src/editseq.c
    branches/soc-2008-jaguarandi/source/blender/src/editsima.c
    branches/soc-2008-jaguarandi/source/blender/src/filelist.c
    branches/soc-2008-jaguarandi/source/blender/src/filesel.c
    branches/soc-2008-jaguarandi/source/blender/src/fluidsim.c
    branches/soc-2008-jaguarandi/source/blender/src/glutil.c
    branches/soc-2008-jaguarandi/source/blender/src/gpencil.c
    branches/soc-2008-jaguarandi/source/blender/src/header_buttonswin.c
    branches/soc-2008-jaguarandi/source/blender/src/header_ipo.c
    branches/soc-2008-jaguarandi/source/blender/src/header_oops.c
    branches/soc-2008-jaguarandi/source/blender/src/header_view3d.c
    branches/soc-2008-jaguarandi/source/blender/src/outliner.c
    branches/soc-2008-jaguarandi/source/blender/src/preview.blend.c
    branches/soc-2008-jaguarandi/source/blender/src/previewrender.c
    branches/soc-2008-jaguarandi/source/blender/src/renderwin.c
    branches/soc-2008-jaguarandi/source/blender/src/retopo.c
    branches/soc-2008-jaguarandi/source/blender/src/seqscopes.c
    branches/soc-2008-jaguarandi/source/blender/src/space.c
    branches/soc-2008-jaguarandi/source/blender/src/toolbox.c
    branches/soc-2008-jaguarandi/source/blender/src/transform.c
    branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c
    branches/soc-2008-jaguarandi/source/blender/src/view.c
    branches/soc-2008-jaguarandi/source/blender/src/writeimage.c
    branches/soc-2008-jaguarandi/source/blender/yafray/intern/export_File.cpp
    branches/soc-2008-jaguarandi/source/blender/yafray/intern/export_Plugin.cpp
    branches/soc-2008-jaguarandi/source/creator/CMakeLists.txt
    branches/soc-2008-jaguarandi/source/creator/Makefile
    branches/soc-2008-jaguarandi/source/creator/creator.c
    branches/soc-2008-jaguarandi/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SConscript
    branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/common/GPC_RawImage.h
    branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2008-jaguarandi/source/gameengine/PyDoc/BL_ActionActuator.py
    branches/soc-2008-jaguarandi/source/gameengine/PyDoc/BL_ShapeActionActuator.py
    branches/soc-2008-jaguarandi/source/gameengine/PyDoc/Rasterizer.py
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_TexVert.h

Added Paths:
-----------
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/controlparticles.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/controlparticles.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/elbeem_control.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/elbeem_control.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/mvmcoords.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/mvmcoords.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_control.cpp
    branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_control.h
    branches/soc-2008-jaguarandi/release/scripts/ms3d_import_ascii.py
    branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_fluidsim.h
    branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/fluidsim.c

Removed Paths:
-------------
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
    branches/soc-2008-jaguarandi/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
    branches/soc-2008-jaguarandi/intern/elbeem/intern/elbeem.h
    branches/soc-2008-jaguarandi/source/blender/include/license_key.h
    branches/soc-2008-jaguarandi/source/blender/src/cre/license.jpeg.c
    branches/soc-2008-jaguarandi/source/blender/src/cre/license_key.c
    branches/soc-2008-jaguarandi/source/blender/src/pub/license_key.c

Modified: branches/soc-2008-jaguarandi/SConstruct
===================================================================
--- branches/soc-2008-jaguarandi/SConstruct	2008-09-26 18:03:14 UTC (rev 16749)
+++ branches/soc-2008-jaguarandi/SConstruct	2008-09-26 18:53:26 UTC (rev 16750)
@@ -422,6 +422,26 @@
             source=[dp+os.sep+f for f in df]
             scriptinstall.append(env.Install(dir=dir,source=source))
 
+#-- icons
+if env['OURPLATFORM']=='linux2':
+	iconlist = []
+	icontargetlist = []
+
+	for tp, tn, tf in os.walk('release/freedesktop/icons'):
+		if 'CVS' in tn:
+			tn.remove('CVS')
+		if '.svn' in tn:
+			tn.remove('.svn')
+		for f in tf:
+			print ">>>", env['BF_INSTALLDIR'], tp, f
+			iconlist.append(tp+os.sep+f)
+			icontargetlist.append(env['BF_INSTALLDIR']+tp[19:]+os.sep+f)
+
+	iconinstall = []
+	for targetdir,srcfile in zip(icontargetlist, iconlist):
+		td, tf = os.path.split(targetdir)
+		iconinstall.append(env.Install(dir=td, source=srcfile))
+
 #-- plugins
 pluglist = []
 plugtargetlist = []
@@ -470,6 +490,8 @@
 
 if  env['OURPLATFORM']=='darwin':
         allinstall = [blenderinstall, plugininstall, textinstall]
+elif env['OURPLATFORM']=='linux2':
+        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
 else:
         allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
 

Modified: branches/soc-2008-jaguarandi/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/soc-2008-jaguarandi/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/soc-2008-jaguarandi/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2008-jaguarandi/extern/bullet2/CMakeLists.txt	2008-09-26 18:03:14 UTC (rev 16749)
+++ branches/soc-2008-jaguarandi/extern/bullet2/CMakeLists.txt	2008-09-26 18:53:26 UTC (rev 16750)
@@ -31,6 +31,7 @@
   src/BulletCollision/BroadphaseCollision/*.cpp
   src/BulletCollision/CollisionShapes/*.cpp
   src/BulletCollision/NarrowPhaseCollision/*.cpp
+  src/BulletCollision/Gimpact/*.cpp
   src/BulletCollision//CollisionDispatch/*.cpp
   src/BulletDynamics/ConstraintSolver/*.cpp
   src/BulletDynamics/Vehicle/*.cpp

Modified: branches/soc-2008-jaguarandi/extern/bullet2/Makefile
===================================================================
--- branches/soc-2008-jaguarandi/extern/bullet2/Makefile	2008-09-26 18:03:14 UTC (rev 16749)
+++ branches/soc-2008-jaguarandi/extern/bullet2/Makefile	2008-09-26 18:53:26 UTC (rev 16750)
@@ -37,6 +37,7 @@
 BulletCollision/BroadphaseCollision \
 BulletCollision/CollisionShapes \
 BulletCollision/NarrowPhaseCollision \
+BulletCollision/Gimpact \
 BulletCollision//CollisionDispatch \
 BulletDynamics/ConstraintSolver \
 BulletDynamics/Vehicle \

Modified: branches/soc-2008-jaguarandi/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-09-26 18:03:14 UTC (rev 16749)
+++ branches/soc-2008-jaguarandi/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2008-09-26 18:53:26 UTC (rev 16750)
@@ -53,21 +53,21 @@
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\Gimpact MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\ConstraintSolver MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Vehicle MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\LinearMath MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
-IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletSoftBody MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 
 XCOPY /Y ..\..\src\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include
 XCOPY /Y ..\..\src\LinearMath\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\LinearMath
-XCOPY /Y ..\..\src\BulletSoftBody\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletSoftBody
 XCOPY /Y ..\..\src\BulletCollision\BroadphaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\BroadphaseCollision
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
 XCOPY /Y ..\..\src\BulletCollision\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch
 XCOPY /Y ..\..\src\BulletCollision\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes
+XCOPY /Y ..\..\src\BulletCollision\Gimpact\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact
 XCOPY /Y ..\..\src\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver
 XCOPY /Y ..\..\src\BulletDynamics\Dynamics\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
 XCOPY /Y ..\..\src\BulletDynamics\Vehicle\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle
@@ -135,6 +135,7 @@
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\Gimpact MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\ConstraintSolver MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
@@ -148,6 +149,7 @@
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
 XCOPY /Y ..\..\src\BulletCollision\CollisionDispatch\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch
 XCOPY /Y ..\..\src\BulletCollision\CollisionShapes\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes
+XCOPY /Y ..\..\src\BulletCollision\Gimpact\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact
 XCOPY /Y ..\..\src\BulletDynamics\ConstraintSolver\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver
 XCOPY /Y ..\..\src\BulletDynamics\Dynamics\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
 XCOPY /Y ..\..\src\BulletDynamics\Vehicle\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Vehicle
@@ -213,6 +215,7 @@
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\NarrowPhaseCollision MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionDispatch MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionDispatch
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\CollisionShapes MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\CollisionShapes
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletCollision\Gimpact MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\Gimpact
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\ConstraintSolver MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\ConstraintSolver
 IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\bullet2\include\BulletDynamics\Dynamics MKDIR ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletDynamics\Dynamics
@@ -226,6 +229,7 @@
 XCOPY /Y ..\..\src\BulletCollision\NarrowPhaseCollision\*.h ..\..\..\..\..\build\msvc_7\extern\bullet\include\BulletCollision\NarrowPhaseCollision

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list