Revision: 16707
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16707
Author: unclezeiv
Date: 2008-09-24 00:11:23 +0200 (Wed, 24 Sep 2008)
Log Message:
-----------
svn merge -r 16582:16706
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/SConstruct
branches/soc-2008-unclezeiv/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/config/darwin-config.py
branches/soc-2008-unclezeiv/config/linux2-config.py
branches/soc-2008-unclezeiv/config/linuxcross-config.py
branches/soc-2008-unclezeiv/config/sunos5-config.py
branches/soc-2008-unclezeiv/config/win32-vc-config.py
branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/soc-2008-unclezeiv/extern/bullet2/src/CMakeLists.txt
branches/soc-2008-unclezeiv/extern/bullet2/src/SConscript
branches/soc-2008-unclezeiv/intern/SoundSystem/SConscript
branches/soc-2008-unclezeiv/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
branches/soc-2008-unclezeiv/intern/elbeem/CMakeLists.txt
branches/soc-2008-unclezeiv/intern/elbeem/SConscript
branches/soc-2008-unclezeiv/intern/elbeem/extern/LBM_fluidsim.h
branches/soc-2008-unclezeiv/intern/elbeem/extern/elbeem.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/elbeem.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/isosurface.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/ntl_geometryclass.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/ntl_geometryobject.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/ntl_geometryobject.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/ntl_ray.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/ntl_ray.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/ntl_world.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/simulation_object.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_adap.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_class.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_init.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_main.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_relax.h
branches/soc-2008-unclezeiv/intern/elbeem/make/msvc_7_0/elbeem.vcproj
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2008-unclezeiv/po/fr.po
branches/soc-2008-unclezeiv/po/kr.po
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2008-unclezeiv/release/datafiles/preview.blend
branches/soc-2008-unclezeiv/release/plugins/sequence/dnr.c
branches/soc-2008-unclezeiv/release/scripts/animation_bake_constraints.py
branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/collada.py
branches/soc-2008-unclezeiv/release/scripts/bpymodules/colladaImEx/translator.py
branches/soc-2008-unclezeiv/release/scripts/console.py
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_bad_level_calls.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_property.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/SConscript
branches/soc-2008-unclezeiv/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/action.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/anim.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/brush.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/curve.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/displist.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/multires.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/property.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/scene.c
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_blenlib.h
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/arithb.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/dynlib.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/edgehash.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/freetypefont.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/util.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c
branches/soc-2008-unclezeiv/source/blender/gpu/GPU_extensions.h
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/divers.c
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/rectop.c
branches/soc-2008-unclezeiv/source/blender/include/BIF_editseq.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_outliner.h
branches/soc-2008-unclezeiv/source/blender/include/blendef.h
branches/soc-2008-unclezeiv/source/blender/include/butspace.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_curve_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_material_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-unclezeiv/source/blender/python/BPY_extern.h
branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Camera.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Ipocurve.h
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Lamp.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Material.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Modifier.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Object.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Pose.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Scene.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Text.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/World.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/API_intro.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/API_related.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Blender.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Modifier.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Object.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/sceneRender.c
branches/soc-2008-unclezeiv/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-unclezeiv/source/blender/render/intern/include/render_types.h
branches/soc-2008-unclezeiv/source/blender/render/intern/include/sunsky.h
branches/soc-2008-unclezeiv/source/blender/render/intern/include/texture.h
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/pipeline.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/rendercore.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/sunsky.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/texture.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/zbuf.c
branches/soc-2008-unclezeiv/source/blender/src/SConscript
branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_logic.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
branches/soc-2008-unclezeiv/source/blender/src/drawaction.c
branches/soc-2008-unclezeiv/source/blender/src/drawipo.c
branches/soc-2008-unclezeiv/source/blender/src/drawmesh.c
branches/soc-2008-unclezeiv/source/blender/src/drawnode.c
branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
branches/soc-2008-unclezeiv/source/blender/src/drawtext.c
branches/soc-2008-unclezeiv/source/blender/src/drawview.c
branches/soc-2008-unclezeiv/source/blender/src/editaction.c
branches/soc-2008-unclezeiv/source/blender/src/editcurve.c
branches/soc-2008-unclezeiv/source/blender/src/editimasel.c
branches/soc-2008-unclezeiv/source/blender/src/editipo.c
branches/soc-2008-unclezeiv/source/blender/src/editipo_lib.c
branches/soc-2008-unclezeiv/source/blender/src/editipo_mods.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_loop.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_tools.c
branches/soc-2008-unclezeiv/source/blender/src/editobject.c
branches/soc-2008-unclezeiv/source/blender/src/editseq.c
branches/soc-2008-unclezeiv/source/blender/src/editsima.c
branches/soc-2008-unclezeiv/source/blender/src/filelist.c
branches/soc-2008-unclezeiv/source/blender/src/filesel.c
branches/soc-2008-unclezeiv/source/blender/src/fluidsim.c
branches/soc-2008-unclezeiv/source/blender/src/glutil.c
branches/soc-2008-unclezeiv/source/blender/src/gpencil.c
branches/soc-2008-unclezeiv/source/blender/src/header_buttonswin.c
branches/soc-2008-unclezeiv/source/blender/src/header_ipo.c
branches/soc-2008-unclezeiv/source/blender/src/header_oops.c
branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
branches/soc-2008-unclezeiv/source/blender/src/outliner.c
branches/soc-2008-unclezeiv/source/blender/src/preview.blend.c
branches/soc-2008-unclezeiv/source/blender/src/previewrender.c
branches/soc-2008-unclezeiv/source/blender/src/renderwin.c
branches/soc-2008-unclezeiv/source/blender/src/retopo.c
branches/soc-2008-unclezeiv/source/blender/src/seqaudio.c
branches/soc-2008-unclezeiv/source/blender/src/seqscopes.c
branches/soc-2008-unclezeiv/source/blender/src/space.c
branches/soc-2008-unclezeiv/source/blender/src/toolbox.c
branches/soc-2008-unclezeiv/source/blender/src/transform.c
branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
branches/soc-2008-unclezeiv/source/blender/src/usiblender.c
branches/soc-2008-unclezeiv/source/blender/src/view.c
branches/soc-2008-unclezeiv/source/blender/src/writeimage.c
branches/soc-2008-unclezeiv/source/blender/yafray/intern/export_File.cpp
branches/soc-2008-unclezeiv/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2008-unclezeiv/source/creator/creator.c
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertSensors.h
branches/soc-2008-unclezeiv/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SConscript
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/GPC_RawImage.h
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/BL_ActionActuator.py
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/BL_ShapeActionActuator.py
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
branches/soc-2008-unclezeiv/tools/Blender.py
branches/soc-2008-unclezeiv/tools/btools.py
Added Paths:
-----------
branches/soc-2008-unclezeiv/intern/elbeem/intern/controlparticles.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/controlparticles.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/elbeem_control.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/elbeem_control.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/mvmcoords.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/mvmcoords.h
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_control.cpp
branches/soc-2008-unclezeiv/intern/elbeem/intern/solver_control.h
branches/soc-2008-unclezeiv/release/scripts/ms3d_import_ascii.py
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_fluidsim.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/fluidsim.c
Removed Paths:
-------------
branches/soc-2008-unclezeiv/intern/elbeem/intern/elbeem.h
Modified: branches/soc-2008-unclezeiv/SConstruct
===================================================================
--- branches/soc-2008-unclezeiv/SConstruct 2008-09-23 20:07:15 UTC (rev
16706)
+++ branches/soc-2008-unclezeiv/SConstruct 2008-09-23 22:11:23 UTC (rev
16707)
@@ -241,6 +241,13 @@
for l in B.quickdebug:
print "\t" + l
+# remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS
+if env['WITH_BF_STATICCXX']:
+ if 'stdc++' in env['LLIBS']:
+ env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ')
+ else:
+ print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX
may not work for your platform'
+
# check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline
if 'blenderplayer' in B.targets:
env['WITH_BF_PLAYER'] = True
@@ -260,7 +267,19 @@
env['WITH_BF_YAFRAY'] = False
env['WITH_BF_REDCODE'] = False
env['WITH_BF_FTGL'] = False
+ env['WITH_BF_DDS'] = False
+ env['WITH_BF_ZLIB'] = False
+ env['WITH_BF_SDL'] = False
+ env['WITH_BF_JPEG'] = False
+ env['WITH_BF_PNG'] = False
+ env['WITH_BF_ODE'] = False
+ env['WITH_BF_BULLET'] = False
+ env['WITH_BF_BINRELOC'] = False
+ env['BF_BUILDINFO'] = False
+ env['BF_NO_ELBEEM'] = True
+
+
# lastly we check for root_build_dir ( we should not do before, otherwise we
might do wrong builddir
#B.root_build_dir = B.arguments.get('BF_BUILDDIR',
'..'+os.sep+'build'+os.sep+platform+os.sep)
B.root_build_dir = env['BF_BUILDDIR']
@@ -403,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 = []
@@ -451,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-unclezeiv/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified:
branches/soc-2008-unclezeiv/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/config/darwin-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/darwin-config.py 2008-09-23 20:07:15 UTC
(rev 16706)
+++ branches/soc-2008-unclezeiv/config/darwin-config.py 2008-09-23 22:11:23 UTC
(rev 16707)
@@ -95,6 +95,11 @@
# Warning, this static lib configuration is untested! users of this OS please
confirm.
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+# Warning, this static lib configuration is untested! users of this OS please
confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
Modified: branches/soc-2008-unclezeiv/config/linux2-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/linux2-config.py 2008-09-23 20:07:15 UTC
(rev 16706)
+++ branches/soc-2008-unclezeiv/config/linux2-config.py 2008-09-23 22:11:23 UTC
(rev 16707)
@@ -25,6 +25,10 @@
# BF_OPENAL_LIB = 'openal alut'
# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a
${BF_OPENAL}/lib/libalut.a'
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = '/usr' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config
--cflags)
Modified: branches/soc-2008-unclezeiv/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/linuxcross-config.py 2008-09-23
20:07:15 UTC (rev 16706)
+++ branches/soc-2008-unclezeiv/config/linuxcross-config.py 2008-09-23
22:11:23 UTC (rev 16707)
@@ -22,6 +22,11 @@
# Warning, this static lib configuration is untested! users of this OS please
confirm.
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+# Warning, this static lib configuration is untested! users of this OS please
confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl'
BF_SDL_INC = '${BF_SDL}/include'
Modified: branches/soc-2008-unclezeiv/config/sunos5-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/sunos5-config.py 2008-09-23 20:07:15 UTC
(rev 16706)
+++ branches/soc-2008-unclezeiv/config/sunos5-config.py 2008-09-23 22:11:23 UTC
(rev 16707)
@@ -17,6 +17,11 @@
# Warning, this static lib configuration is untested! users of this OS please
confirm.
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+# Warning, this static lib configuration is untested! users of this OS please
confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config
--cflags)
Modified: branches/soc-2008-unclezeiv/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/win32-vc-config.py 2008-09-23
20:07:15 UTC (rev 16706)
+++ branches/soc-2008-unclezeiv/config/win32-vc-config.py 2008-09-23
22:11:23 UTC (rev 16707)
@@ -27,6 +27,11 @@
# Warning, this static lib configuration is untested! users of this OS please
confirm.
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+# TODO - are these useful on win32?
+# BF_CXX = '/usr'
+# WITH_BF_STATICCXX = 'false'
+# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_ICONV = 'true'
BF_ICONV = LIBDIR + '/iconv'
BF_ICONV_INC = '${BF_ICONV}/include'
Modified:
branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
2008-09-23 20:07:15 UTC (rev 16706)
+++ branches/soc-2008-unclezeiv/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
2008-09-23 22:11:23 UTC (rev 16707)
@@ -58,9 +58,11 @@
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
@@ -977,6 +979,9 @@
RelativePath="..\..\src\LinearMath\btAlignedObjectArray.h">
</File>
<File
+
RelativePath="..\..\src\LinearMath\btConvexHull.cpp">
+ </File>
+ <File
RelativePath="..\..\src\LinearMath\btConvexHull.h">
</File>
<File
@@ -989,6 +994,9 @@
RelativePath="..\..\src\LinearMath\btGeometryUtil.h">
</File>
<File
+
RelativePath="..\..\src\LinearMath\btHashMap.h">
+ </File>
+ <File
RelativePath="..\..\src\LinearMath\btIDebugDraw.h">
</File>
<File
@@ -1040,6 +1048,58 @@
RelativePath="..\..\src\LinearMath\btVector3.h">
</File>
</Filter>
+ <Filter
+ Name="BulletSoftBody"
+ Filter="">
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBody.cpp">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBody.h">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBodyConcaveCollisionAlgorithm.cpp">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBodyConcaveCollisionAlgorithm.h">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBodyHelpers.cpp">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBodyHelpers.h">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBodyInternals.h">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.cpp">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.h">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftRigidCollisionAlgorithm.cpp">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftRigidCollisionAlgorithm.h">
+ </File>
+ <File
+
RelativePath="..\..\src\BulletSoftBody\btSoftRigidDynamicsWorld.cpp">
+ </File>
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
