[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17044] branches/sim_physics: svn merge -r 16866:17042 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Sun Oct 12 14:17:57 CEST 2008
Revision: 17044
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17044
Author: genscher
Date: 2008-10-12 14:17:57 +0200 (Sun, 12 Oct 2008)
Log Message:
-----------
svn merge -r 16866:17042 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/sim_physics/CMakeLists.txt
branches/sim_physics/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/sim_physics/config/linux2-config.py
branches/sim_physics/config/win32-vc-config.py
branches/sim_physics/doc/blender-scons.txt
branches/sim_physics/extern/SConscript
branches/sim_physics/extern/bullet2/src/Bullet-C-Api.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
branches/sim_physics/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/sim_physics/extern/bullet2/src/LinearMath/btConvexHull.cpp
branches/sim_physics/extern/bullet2/src/LinearMath/btConvexHull.h
branches/sim_physics/extern/bullet2/src/LinearMath/btHashMap.h
branches/sim_physics/extern/bullet2/src/LinearMath/btPoolAllocator.h
branches/sim_physics/extern/bullet2/src/LinearMath/btScalar.h
branches/sim_physics/extern/ffmpeg/SConscript
branches/sim_physics/intern/SoundSystem/SND_Utils.h
branches/sim_physics/intern/SoundSystem/fmod/SND_FmodDevice.cpp
branches/sim_physics/intern/SoundSystem/intern/SND_Scene.cpp
branches/sim_physics/intern/SoundSystem/intern/SND_SoundObject.cpp
branches/sim_physics/intern/SoundSystem/intern/SND_Utils.cpp
branches/sim_physics/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
branches/sim_physics/intern/elbeem/intern/Makefile
branches/sim_physics/intern/elbeem/intern/elbeem.cpp
branches/sim_physics/intern/elbeem/intern/mvmcoords.cpp
branches/sim_physics/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/sim_physics/po/ar.po
branches/sim_physics/po/bg.po
branches/sim_physics/po/ca.po
branches/sim_physics/po/cs.po
branches/sim_physics/po/de.po
branches/sim_physics/po/el.po
branches/sim_physics/po/es.po
branches/sim_physics/po/fi.po
branches/sim_physics/po/fr.po
branches/sim_physics/po/hr.po
branches/sim_physics/po/it.po
branches/sim_physics/po/ja.po
branches/sim_physics/po/ko.po
branches/sim_physics/po/nl.po
branches/sim_physics/po/pl.po
branches/sim_physics/po/pt_BR.po
branches/sim_physics/po/ro.po
branches/sim_physics/po/ru.po
branches/sim_physics/po/sr.po
branches/sim_physics/po/sr at Latn.po
branches/sim_physics/po/sv.po
branches/sim_physics/po/uk.po
branches/sim_physics/po/zh_CN.po
branches/sim_physics/release/scripts/bvh_import.py
branches/sim_physics/release/scripts/c3d_import.py
branches/sim_physics/release/scripts/config.py
branches/sim_physics/release/scripts/export_dxf.py
branches/sim_physics/release/scripts/help_browser.py
branches/sim_physics/release/scripts/vrml97_export.py
branches/sim_physics/release/text/Python-license.txt
branches/sim_physics/source/blender/blenkernel/BKE_blender.h
branches/sim_physics/source/blender/blenkernel/BKE_displist.h
branches/sim_physics/source/blender/blenkernel/BKE_global.h
branches/sim_physics/source/blender/blenkernel/BKE_writeffmpeg.h
branches/sim_physics/source/blender/blenkernel/intern/DerivedMesh.c
branches/sim_physics/source/blender/blenkernel/intern/bullet.c
branches/sim_physics/source/blender/blenkernel/intern/curve.c
branches/sim_physics/source/blender/blenkernel/intern/displist.c
branches/sim_physics/source/blender/blenkernel/intern/exotic.c
branches/sim_physics/source/blender/blenkernel/intern/fluidsim.c
branches/sim_physics/source/blender/blenkernel/intern/idprop.c
branches/sim_physics/source/blender/blenkernel/intern/image.c
branches/sim_physics/source/blender/blenkernel/intern/key.c
branches/sim_physics/source/blender/blenkernel/intern/library.c
branches/sim_physics/source/blender/blenkernel/intern/modifier.c
branches/sim_physics/source/blender/blenkernel/intern/multires.c
branches/sim_physics/source/blender/blenkernel/intern/particle_system.c
branches/sim_physics/source/blender/blenkernel/intern/pointcache.c
branches/sim_physics/source/blender/blenkernel/intern/writeffmpeg.c
branches/sim_physics/source/blender/blenlib/intern/dynlib.c
branches/sim_physics/source/blender/blenlib/intern/fileops.c
branches/sim_physics/source/blender/blenlib/intern/util.c
branches/sim_physics/source/blender/blenloader/intern/readfile.c
branches/sim_physics/source/blender/gpu/intern/gpu_codegen.c
branches/sim_physics/source/blender/gpu/intern/gpu_draw.c
branches/sim_physics/source/blender/gpu/intern/gpu_material.c
branches/sim_physics/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/sim_physics/source/blender/imbuf/intern/cineon/cineonlib.c
branches/sim_physics/source/blender/imbuf/intern/cineon/dpxlib.c
branches/sim_physics/source/blender/imbuf/intern/dynlibtiff.c
branches/sim_physics/source/blender/include/BDR_editobject.h
branches/sim_physics/source/blender/include/BDR_gpencil.h
branches/sim_physics/source/blender/include/BIF_drawgpencil.h
branches/sim_physics/source/blender/include/BIF_editaction.h
branches/sim_physics/source/blender/include/BIF_keyframing.h
branches/sim_physics/source/blender/include/BSE_seqaudio.h
branches/sim_physics/source/blender/makesdna/DNA_actuator_types.h
branches/sim_physics/source/blender/makesdna/DNA_constraint_types.h
branches/sim_physics/source/blender/makesdna/DNA_gpencil_types.h
branches/sim_physics/source/blender/makesdna/DNA_object_fluidsim.h
branches/sim_physics/source/blender/makesdna/DNA_sensor_types.h
branches/sim_physics/source/blender/makesdna/DNA_userdef_types.h
branches/sim_physics/source/blender/makesdna/DNA_view3d_types.h
branches/sim_physics/source/blender/python/BPY_interface.c
branches/sim_physics/source/blender/python/BPY_menus.c
branches/sim_physics/source/blender/python/api2_2x/Ipocurve.c
branches/sim_physics/source/blender/python/api2_2x/NMesh.c
branches/sim_physics/source/blender/python/api2_2x/Object.c
branches/sim_physics/source/blender/python/api2_2x/Particle.c
branches/sim_physics/source/blender/python/api2_2x/Window.c
branches/sim_physics/source/blender/python/api2_2x/doc/IpoCurve.py
branches/sim_physics/source/blender/python/api2_2x/doc/Object.py
branches/sim_physics/source/blender/render/extern/include/RE_shader_ext.h
branches/sim_physics/source/blender/render/intern/include/shading.h
branches/sim_physics/source/blender/render/intern/source/convertblender.c
branches/sim_physics/source/blender/render/intern/source/rayshade.c
branches/sim_physics/source/blender/render/intern/source/rendercore.c
branches/sim_physics/source/blender/render/intern/source/shadeinput.c
branches/sim_physics/source/blender/render/intern/source/zbuf.c
branches/sim_physics/source/blender/src/SConscript
branches/sim_physics/source/blender/src/buttons_editing.c
branches/sim_physics/source/blender/src/buttons_logic.c
branches/sim_physics/source/blender/src/buttons_object.c
branches/sim_physics/source/blender/src/buttons_scene.c
branches/sim_physics/source/blender/src/buttons_shading.c
branches/sim_physics/source/blender/src/drawarmature.c
branches/sim_physics/source/blender/src/drawgpencil.c
branches/sim_physics/source/blender/src/drawimage.c
branches/sim_physics/source/blender/src/drawnode.c
branches/sim_physics/source/blender/src/drawobject.c
branches/sim_physics/source/blender/src/drawseq.c
branches/sim_physics/source/blender/src/drawtext.c
branches/sim_physics/source/blender/src/drawtime.c
branches/sim_physics/source/blender/src/drawview.c
branches/sim_physics/source/blender/src/edit.c
branches/sim_physics/source/blender/src/editaction_gpencil.c
branches/sim_physics/source/blender/src/editmesh.c
branches/sim_physics/source/blender/src/editmesh_lib.c
branches/sim_physics/source/blender/src/editnode.c
branches/sim_physics/source/blender/src/editobject.c
branches/sim_physics/source/blender/src/editsound.c
branches/sim_physics/source/blender/src/fluidsim.c
branches/sim_physics/source/blender/src/ghostwinlay.c
branches/sim_physics/source/blender/src/gpencil.c
branches/sim_physics/source/blender/src/header_action.c
branches/sim_physics/source/blender/src/header_view3d.c
branches/sim_physics/source/blender/src/imagepaint.c
branches/sim_physics/source/blender/src/interface.c
branches/sim_physics/source/blender/src/keyframing.c
branches/sim_physics/source/blender/src/playanim.c
branches/sim_physics/source/blender/src/retopo.c
branches/sim_physics/source/blender/src/seqaudio.c
branches/sim_physics/source/blender/src/sequence.c
branches/sim_physics/source/blender/src/space.c
branches/sim_physics/source/blender/src/toets.c
branches/sim_physics/source/blender/src/transform_conversions.c
branches/sim_physics/source/blender/src/transform_manipulator.c
branches/sim_physics/source/blender/src/transform_snap.c
branches/sim_physics/source/blender/src/usiblender.c
branches/sim_physics/source/blender/src/view.c
branches/sim_physics/source/blender/yafray/intern/export_Plugin.cpp
branches/sim_physics/source/creator/CMakeLists.txt
branches/sim_physics/source/creator/creator.c
branches/sim_physics/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/sim_physics/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/sim_physics/source/gameengine/Converter/BL_ActionActuator.cpp
branches/sim_physics/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/sim_physics/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/sim_physics/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/sim_physics/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/sim_physics/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/sim_physics/source/gameengine/Expressions/PyObjectPlus.h
branches/sim_physics/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/sim_physics/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/sim_physics/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/sim_physics/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/sim_physics/source/gameengine/GamePlayer/netscape/test/resource/test.html
branches/sim_physics/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/sim_physics/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/sim_physics/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/sim_physics/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_IpoActuator.h
branches/sim_physics/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_PythonInit.h
branches/sim_physics/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/sim_physics/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/sim_physics/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/sim_physics/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/sim_physics/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/sim_physics/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/sim_physics/tools/Blender.py
branches/sim_physics/tools/btools.py
Added Paths:
-----------
branches/sim_physics/release/scripts/bpymodules/dxfLibrary.py
branches/sim_physics/source/gameengine/GamePlayer/xembed/apparmor/
branches/sim_physics/source/gameengine/GamePlayer/xembed/apparmor/README
branches/sim_physics/source/gameengine/GamePlayer/xembed/apparmor/usr.bin.blenderplayer-web
branches/sim_physics/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
Removed Paths:
-------------
branches/sim_physics/source/gameengine/GamePlayer/xembed/apparmor/README
branches/sim_physics/source/gameengine/GamePlayer/xembed/apparmor/usr.bin.blenderplayer-web
Property Changed:
----------------
branches/sim_physics/source/blender/include/BDR_gpencil.h
branches/sim_physics/source/blender/include/BIF_drawgpencil.h
branches/sim_physics/source/blender/include/BIF_keyframing.h
branches/sim_physics/source/blender/makesdna/DNA_gpencil_types.h
branches/sim_physics/source/blender/src/drawgpencil.c
branches/sim_physics/source/blender/src/editaction_gpencil.c
branches/sim_physics/source/blender/src/gpencil.c
branches/sim_physics/source/blender/src/keyframing.c
Modified: branches/sim_physics/CMakeLists.txt
===================================================================
--- branches/sim_physics/CMakeLists.txt 2008-10-12 12:00:26 UTC (rev 17043)
+++ branches/sim_physics/CMakeLists.txt 2008-10-12 12:17:57 UTC (rev 17044)
@@ -64,7 +64,7 @@
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
-OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Mozilla-Unix only)" OFF)
+OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -429,6 +429,17 @@
#-----------------------------------------------------------------------------
+# Blender WebPlugin
+
+IF(WITH_WEBPLUGIN)
+ SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
+ SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
+
+ SET(WITH_PLAYER ON)
+ENDIF(WITH_WEBPLUGIN)
+
+
+#-----------------------------------------------------------------------------
# Configure OpenGL.
INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
@@ -457,12 +468,6 @@
# Blender Application
SUBDIRS(source/creator)
-#-----------------------------------------------------------------------------
-# Blender WebPlugin
-IF(WITH_WEBPLUGIN)
- SET(MOZILLA_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
- SET(WITH_PLAYER ON)
-ENDIF(WITH_WEBPLUGIN)
#-----------------------------------------------------------------------------
# Blender Player
Modified: branches/sim_physics/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/de/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/el/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/es/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/config/linux2-config.py
===================================================================
--- branches/sim_physics/config/linux2-config.py 2008-10-12 12:00:26 UTC (rev 17043)
+++ branches/sim_physics/config/linux2-config.py 2008-10-12 12:17:57 UTC (rev 17044)
@@ -143,21 +143,21 @@
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = 'false' # -DWITH_OGG
+BF_OGG = '/usr'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+
WITH_BF_OPENJPEG = 'true'
BF_OPENJPEG = '#extern/libopenjpeg'
BF_OPENJPEG_LIB = ''
-# Uncomment the following two lines to use system's ffmpeg
-# BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
WITH_BF_REDCODE = 'false'
BF_REDCODE = '#extern/libredcode'
BF_REDCODE_LIB = ''
-# Uncomment the following two lines to use system's ffmpeg
-# BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
BF_REDCODE_INC = '${BF_REDCODE}/include'
BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
Modified: branches/sim_physics/config/win32-vc-config.py
===================================================================
--- branches/sim_physics/config/win32-vc-config.py 2008-10-12 12:00:26 UTC (rev 17043)
+++ branches/sim_physics/config/win32-vc-config.py 2008-10-12 12:17:57 UTC (rev 17044)
@@ -5,7 +5,7 @@
BF_VERSE_INCLUDE = "#extern/verse/dist"
# enable ffmpeg support
-WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
+WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
BF_FFMPEG = LIBDIR +'/ffmpeg'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -57,7 +57,7 @@
BF_OPENEXR = LIBDIR + '/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008'
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
@@ -96,7 +96,8 @@
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE = 'false'
+WITH_BF_GAMEENGINE = 'true'
+WITH_BF_PLAYER = 'true'
WITH_BF_ODE = 'true'
BF_ODE = LIBDIR + '/ode'
@@ -158,7 +159,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Og', '/Ot', '/Ob1', '/Op', '/G6','/EHsc', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -171,17 +172,18 @@
LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
PLATFORM_LINKFLAGS = '''
- /SUBSYSTEM:CONSOLE
- /MACHINE:IX86
- /ENTRY:mainCRTStartup
- /INCREMENTAL:NO
- /NODEFAULTLIB:"msvcprt.lib"
- /NODEFAULTLIB:"glut32.lib"
- /NODEFAULTLIB:"libc.lib"
- /NODEFAULTLIB:"libcd.lib"
- /NODEFAULTLIB:"libcpd.lib"
- /NODEFAULTLIB:"libcp.lib"
- '''
-
+ /SUBSYSTEM:CONSOLE
+ /MACHINE:IX86
+ /ENTRY:mainCRTStartup
+ /INCREMENTAL:NO
+ /NODEFAULTLIB:"msvcprt.lib"
+ /NODEFAULTLIB:"glut32.lib"
+ /NODEFAULTLIB:"libc.lib"
+ /NODEFAULTLIB:"libcd.lib"
+ /NODEFAULTLIB:"libcpd.lib"
+ /NODEFAULTLIB:"libcp.lib"
+ /LARGEADDRESSAWARE
+ '''
+
BF_BUILDDIR = '..\\build\\win32-vc'
BF_INSTALLDIR='..\\install\\win32-vc'
Modified: branches/sim_physics/doc/blender-scons.txt
===================================================================
--- branches/sim_physics/doc/blender-scons.txt 2008-10-12 12:00:26 UTC (rev 17043)
+++ branches/sim_physics/doc/blender-scons.txt 2008-10-12 12:17:57 UTC (rev 17044)
@@ -58,7 +58,14 @@
$BLENDERHOME/config/(platform)-config.py. After the build successfully
completes, you can find everything you need in BF_INSTALLDIR.
+ If you want to create the installer package of Blender on Windows you'll
+ need to install nullsoft scriptable install system from http://nsis.sf.net.
+ As an extra dependency, you need the MoreInfo plugin too. The creation of
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list