[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20741] branches/blender2.5/blender: 2.50:
Brecht Van Lommel
brecht at blender.org
Mon Jun 8 22:08:24 CEST 2009
Revision: 20741
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20741
Author: blendix
Date: 2009-06-08 22:08:19 +0200 (Mon, 08 Jun 2009)
Log Message:
-----------
2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD
Notes:
* Game and sequencer RNA, and sequencer header are now out of date
a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
not needed anymore.
* Fix "duplicate strip" always increase the user count for ipo.
* IPO pinning on sequencer strips was lost during Undo.
Modified Paths:
--------------
branches/blender2.5/blender/CMake/macros.cmake
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/blender2.5/blender/config/irix6-config.py
branches/blender2.5/blender/config/linux2-config.py
branches/blender2.5/blender/extern/CMakeLists.txt
branches/blender2.5/blender/extern/Makefile
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/blender2.5/blender/extern/bullet2/src/CMakeLists.txt
branches/blender2.5/blender/extern/bullet2/src/LinearMath/btScalar.h
branches/blender2.5/blender/extern/ffmpeg/Makefile
branches/blender2.5/blender/extern/ffmpeg/libavcodec/Makefile
branches/blender2.5/blender/extern/ffmpeg/libavcodec/eval.c
branches/blender2.5/blender/extern/ffmpeg/libavcodec/x86/dsputil_mmx.c
branches/blender2.5/blender/extern/ffmpeg/libavcodec/x86/x86inc.asm
branches/blender2.5/blender/extern/ffmpeg/libavformat/dv.c
branches/blender2.5/blender/extern/libopenjpeg/jp2.c
branches/blender2.5/blender/intern/CMakeLists.txt
branches/blender2.5/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
branches/blender2.5/blender/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemCarbon.h
branches/blender2.5/blender/intern/guardedalloc/intern/mmap_win.c
branches/blender2.5/blender/po/de.po
branches/blender2.5/blender/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj
branches/blender2.5/blender/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
branches/blender2.5/blender/release/Makefile
branches/blender2.5/blender/release/datafiles/splash.jpg
branches/blender2.5/blender/release/scripts/3ds_export.py
branches/blender2.5/blender/release/scripts/3ds_import.py
branches/blender2.5/blender/release/scripts/DirectX8Exporter.py
branches/blender2.5/blender/release/scripts/add_mesh_torus.py
branches/blender2.5/blender/release/scripts/bpymodules/BPyMathutils.py
branches/blender2.5/blender/release/scripts/bpymodules/BPyMesh.py
branches/blender2.5/blender/release/scripts/bpymodules/BPyMesh_redux.py
branches/blender2.5/blender/release/scripts/bpymodules/BPyWindow.py
branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/collada.py
branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/cutils.py
branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/translator.py
branches/blender2.5/blender/release/scripts/bpymodules/dxfLibrary.py
branches/blender2.5/blender/release/scripts/bpymodules/mesh_gradient.py
branches/blender2.5/blender/release/scripts/bpymodules/paths_svg2obj.py
branches/blender2.5/blender/release/scripts/c3d_import.py
branches/blender2.5/blender/release/scripts/colladaExport14.py
branches/blender2.5/blender/release/scripts/colladaImport14.py
branches/blender2.5/blender/release/scripts/console.py
branches/blender2.5/blender/release/scripts/envelope_symmetry.py
branches/blender2.5/blender/release/scripts/export_dxf.py
branches/blender2.5/blender/release/scripts/export_fbx.py
branches/blender2.5/blender/release/scripts/export_obj.py
branches/blender2.5/blender/release/scripts/help_bpy_api.py
branches/blender2.5/blender/release/scripts/help_getting_started.py
branches/blender2.5/blender/release/scripts/help_manual.py
branches/blender2.5/blender/release/scripts/help_release_notes.py
branches/blender2.5/blender/release/scripts/help_tutorials.py
branches/blender2.5/blender/release/scripts/help_web_blender.py
branches/blender2.5/blender/release/scripts/help_web_devcomm.py
branches/blender2.5/blender/release/scripts/help_web_eshop.py
branches/blender2.5/blender/release/scripts/help_web_usercomm.py
branches/blender2.5/blender/release/scripts/import_dxf.py
branches/blender2.5/blender/release/scripts/import_obj.py
branches/blender2.5/blender/release/scripts/import_web3d.py
branches/blender2.5/blender/release/scripts/lightwave_export.py
branches/blender2.5/blender/release/scripts/md2_export.py
branches/blender2.5/blender/release/scripts/mesh_mirror_tool.py
branches/blender2.5/blender/release/scripts/mesh_poly_reduce_grid.py
branches/blender2.5/blender/release/scripts/mesh_skin.py
branches/blender2.5/blender/release/scripts/mesh_unfolder.py
branches/blender2.5/blender/release/scripts/object_cookie_cutter.py
branches/blender2.5/blender/release/scripts/object_drop.py
branches/blender2.5/blender/release/scripts/ply_import.py
branches/blender2.5/blender/release/scripts/rvk1_torvk2.py
branches/blender2.5/blender/release/scripts/scripttemplate_gamelogic.py
branches/blender2.5/blender/release/scripts/scripttemplate_gamelogic_basic.py
branches/blender2.5/blender/release/scripts/uvcalc_quad_clickproj.py
branches/blender2.5/blender/release/scripts/uvcalc_smart_project.py
branches/blender2.5/blender/release/scripts/vertexpaint_selfshadow_ao.py
branches/blender2.5/blender/release/scripts/wizard_curve2tree.py
branches/blender2.5/blender/release/ui/space_sequencer.py
branches/blender2.5/blender/source/CMakeLists.txt
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_scene.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/bmfont.c
branches/blender2.5/blender/source/blender/blenkernel/intern/bullet.c
branches/blender2.5/blender/source/blender/blenkernel/intern/cloth.c
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/customdata.c
branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/font.c
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/blenkernel/intern/mball.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
branches/blender2.5/blender/source/blender/blenkernel/intern/shrinkwrap.c
branches/blender2.5/blender/source/blender/blenkernel/intern/softbody.c
branches/blender2.5/blender/source/blender/blenkernel/intern/world.c
branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/blender2.5/blender/source/blender/blenlib/BLI_string.h
branches/blender2.5/blender/source/blender/blenlib/BLI_vfontdata.h
branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
branches/blender2.5/blender/source/blender/blenlib/intern/string.c
branches/blender2.5/blender/source/blender/blenlib/intern/util.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature_sketch.c
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/editors/armature/reeb.c
branches/blender2.5/blender/source/blender/editors/curve/editfont.c
branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
branches/blender2.5/blender/source/blender/editors/space_file/filelist.c
branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/blender2.5/blender/source/blender/gpu/GPU_material.h
branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c
branches/blender2.5/blender/source/blender/gpu/intern/gpu_material.c
branches/blender2.5/blender/source/blender/imbuf/IMB_imbuf.h
branches/blender2.5/blender/source/blender/imbuf/intern/anim.c
branches/blender2.5/blender/source/blender/imbuf/intern/imageprocess.c
branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/blender2.5/blender/source/blender/imbuf/intern/rotate.c
branches/blender2.5/blender/source/blender/imbuf/intern/scaling.c
branches/blender2.5/blender/source/blender/makesdna/CMakeLists.txt
branches/blender2.5/blender/source/blender/makesdna/DNA_actuator_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_controller_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_object_force.h
branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_sensor_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_world_types.h
branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object_force.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
branches/blender2.5/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/blender/render/intern/source/occlusion.c
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
branches/blender2.5/blender/source/blender/render/intern/source/rayshade.c
branches/blender2.5/blender/source/blender/render/intern/source/rendercore.c
branches/blender2.5/blender/source/blender/render/intern/source/shadeoutput.c
branches/blender2.5/blender/source/blender/render/intern/source/texture.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/creator/buildinfo.c
branches/blender2.5/blender/source/creator/creator.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/blender2.5/blender/source/gameengine/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ActionActuator.h
branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.h
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_DeformableGameObject.h
branches/blender2.5/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_MeshDeformer.h
branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.h
branches/blender2.5/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_SkinDeformer.h
branches/blender2.5/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.h
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertControllers.h
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.h
branches/blender2.5/blender/source/gameengine/Expressions/BoolValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/BoolValue.h
branches/blender2.5/blender/source/gameengine/Expressions/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Expressions/EmptyValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/ErrorValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/ErrorValue.h
branches/blender2.5/blender/source/gameengine/Expressions/FloatValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/FloatValue.h
branches/blender2.5/blender/source/gameengine/Expressions/IfExpr.cpp
branches/blender2.5/blender/source/gameengine/Expressions/InputParser.cpp
branches/blender2.5/blender/source/gameengine/Expressions/InputParser.h
branches/blender2.5/blender/source/gameengine/Expressions/IntValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/IntValue.h
branches/blender2.5/blender/source/gameengine/Expressions/ListValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/ListValue.h
branches/blender2.5/blender/source/gameengine/Expressions/Makefile
branches/blender2.5/blender/source/gameengine/Expressions/PyObjectPlus.cpp
branches/blender2.5/blender/source/gameengine/Expressions/PyObjectPlus.h
branches/blender2.5/blender/source/gameengine/Expressions/SConscript
branches/blender2.5/blender/source/gameengine/Expressions/StringValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/StringValue.h
branches/blender2.5/blender/source/gameengine/Expressions/Value.cpp
branches/blender2.5/blender/source/gameengine/Expressions/Value.h
branches/blender2.5/blender/source/gameengine/Expressions/VectorValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/VectorValue.h
branches/blender2.5/blender/source/gameengine/GameLogic/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/Makefile
branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/Makefile
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ANDController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_EventManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_EventManager.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ExpressionController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IActuator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IActuator.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IObject.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IObject.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IScene.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IScene.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ISensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_LogicManager.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_MouseManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NANDController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NORController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NORController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ORController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ORController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PythonController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XNORController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XORController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XORController.h
branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/BL_BlenderShader.h
branches/blender2.5/blender/source/gameengine/Ketsji/BL_Material.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/BL_Material.h
branches/blender2.5/blender/source/gameengine/Ketsji/BL_Shader.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/BL_Shader.h
branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/Makefile
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CDActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Camera.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Camera.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CameraActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Dome.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Dome.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_IPhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_IpoActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Light.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Light.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MeshProxy.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MotionState.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MotionState.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_NearSensor.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_OdePhysicsController.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ParentActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PyMath.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PyMath.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RadarSensor.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RayEventManager.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RaySensor.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Scene.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Scene.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SceneActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_StateActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_TouchSensor.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VertexProxy.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Network/NG_NetworkScene.cpp
branches/blender2.5/blender/source/gameengine/Physics/BlOde/OdePhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Physics/BlOde/OdePhysicsController.h
branches/blender2.5/blender/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
branches/blender2.5/blender/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/blender2.5/blender/source/gameengine/Physics/Bullet/Makefile
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/blender2.5/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/blender2.5/blender/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Physics/Sumo/SumoPhysicsController.h
branches/blender2.5/blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/blender2.5/blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/blender2.5/blender/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/blender2.5/blender/source/gameengine/Physics/common/PHY_IMotionState.h
branches/blender2.5/blender/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/blender2.5/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/blender2.5/blender/source/gameengine/PyDoc/GameKeys.py
branches/blender2.5/blender/source/gameengine/PyDoc/GameLogic.py
branches/blender2.5/blender/source/gameengine/PyDoc/GameTypes.py
branches/blender2.5/blender/source/gameengine/PyDoc/Rasterizer.py
branches/blender2.5/blender/source/gameengine/PyDoc/bge_api_validate_py.txt
branches/blender2.5/blender/source/gameengine/PyDoc/epy_docgen.sh
branches/blender2.5/blender/source/gameengine/Rasterizer/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Rasterizer/Makefile
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_CameraData.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_Deformer.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/SConscript
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_IObject.cpp
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_IObject.h
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_Node.cpp
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_Node.h
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_Spatial.h
branches/blender2.5/blender/source/gameengine/VideoTexture/BlendType.h
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterColor.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterNormal.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterSource.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageBase.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageBuff.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageMix.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageRender.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageViewport.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/PyTypeList.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/Texture.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/VideoBase.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/VideoBase.h
branches/blender2.5/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/blender2.5/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/blender2.5/blender/source/kernel/gen_system/GEN_HashedPtr.cpp
branches/blender2.5/blender/source/nan_definitions.mk
branches/blender2.5/blender/tools/Blender.py
branches/blender2.5/blender/tools/btools.py
Added Paths:
-----------
branches/blender2.5/blender/extern/ffmpeg/patches/ffmpeg_work_around_ac3_sse2_crash.patch
branches/blender2.5/blender/extern/ffmpeg/patches/ffmpeg_work_around_dv_crash.patch
branches/blender2.5/blender/release/scripts/animation_clean.py
branches/blender2.5/blender/release/scripts/image_2d_cutout.py
branches/blender2.5/blender/release/scripts/object_active_to_other.py
branches/blender2.5/blender/release/scripts/scripttemplate_gamelogic_module.py
branches/blender2.5/blender/release/scripts/textplugin_convert_ge.py
branches/blender2.5/blender/release/scripts/wizard_bolt_factory.py
branches/blender2.5/blender/release/scripts/wizard_landscape_ant.py
branches/blender2.5/blender/release/text/release_249.txt
branches/blender2.5/blender/release/windows/extra/python26.zip
branches/blender2.5/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ModifierDeformer.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.h
branches/blender2.5/blender/source/gameengine/PyDoc/API_intro.py
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_DList.h
branches/blender2.5/blender/source/gameengine/SceneGraph/SG_QList.h
Removed Paths:
-------------
branches/blender2.5/blender/intern/SoundSystem/fmod/
branches/blender2.5/blender/release/scripts/bpymodules/BPyMesh_octree.py
branches/blender2.5/blender/release/scripts/xfig_export.py
branches/blender2.5/blender/release/text/release_247.txt
branches/blender2.5/blender/release/text/release_248.txt
branches/blender2.5/blender/release/windows/extra/python26.zip
branches/blender2.5/blender/source/gameengine/PyDoc/BL_ActionActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/BL_Shader.py
branches/blender2.5/blender/source/gameengine/PyDoc/BL_ShapeActionActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/CListValue.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_BlenderMaterial.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_CDActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_Camera.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_CameraActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_ConstraintWrapper.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_GameActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_GameObject.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_IpoActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_LightObject.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_MeshProxy.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_MouseFocusSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_NearSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_NetworkMessageActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_NetworkMessageSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_ObjectActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_ParentActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_PhysicsObjectWrapper.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_PolyProxy.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_PolygonMaterial.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_RadarSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_RaySensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_SCA_DynamicActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_SCA_EndObjectActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_Scene.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_SceneActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_SoundActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_StateActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_TouchSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_TrackToActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_VehicleWrapper.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_VertexProxy.py
branches/blender2.5/blender/source/gameengine/PyDoc/KX_VisibilityActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_2DFilterActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_ANDController.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_ActuatorSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_AlwaysSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_DelaySensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_IActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_IController.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_ILogicBrick.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_ISensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_JoystickSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_KeyboardSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_MouseSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_NANDController.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_NORController.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_ORController.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_PropertyActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_PropertySensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_PythonController.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_RandomActuator.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_RandomSensor.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_XNORController.py
branches/blender2.5/blender/source/gameengine/PyDoc/SCA_XORController.py
branches/blender2.5/blender/source/gameengine/PyDoc/WhatsNew.py
Modified: branches/blender2.5/blender/CMake/macros.cmake
===================================================================
--- branches/blender2.5/blender/CMake/macros.cmake 2009-06-08 19:44:07 UTC (rev 20740)
+++ branches/blender2.5/blender/CMake/macros.cmake 2009-06-08 20:08:19 UTC (rev 20741)
@@ -59,9 +59,26 @@
MACRO(SETUP_LIBLINKS
target)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+ #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+
+ # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
+
+ IF(WIN32)
+
+ TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+
+ TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+
+ ELSE(WIN32)
+
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+
+ ENDIF(WIN32)
+
+
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-06-08 19:44:07 UTC (rev 20740)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-06-08 20:08:19 UTC (rev 20741)
@@ -99,20 +99,6 @@
ENDIF(OPENAL_FOUND)
ENDIF(WITH_OPENAL)
- FIND_LIBRARY(ALUT_LIBRARY
- NAMES alut
- PATHS
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- )
- IF(ALUT_LIBRARY)
- SET(OPENAL_LIB ${OPENAL_LIB} ${ALUT_LIBRARY})
- ENDIF(ALUT_LIBRARY)
-
FIND_LIBRARY(INTL_LIBRARY
NAMES intl
PATHS
@@ -288,7 +274,7 @@
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include)
- SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
+ SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
IF(CMAKE_CL_64)
@@ -468,20 +454,18 @@
#-----------------------------------------------------------------------------
# Libraries
FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
-SUBDIRS(
- intern
- extern
- source
-)
+ADD_SUBDIRECTORY(intern)
+ADD_SUBDIRECTORY(extern)
+ADD_SUBDIRECTORY(source)
#-----------------------------------------------------------------------------
# Blender Application
-SUBDIRS(source/creator)
+ADD_SUBDIRECTORY(source/creator)
#-----------------------------------------------------------------------------
# Blender Player
IF(WITH_PLAYER)
- SUBDIRS(blenderplayer)
+ ADD_SUBDIRECTORY(blenderplayer)
ENDIF(WITH_PLAYER)
Modified: branches/blender2.5/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/blender2.5/blender/config/irix6-config.py
===================================================================
--- branches/blender2.5/blender/config/irix6-config.py 2009-06-08 19:44:07 UTC (rev 20740)
+++ branches/blender2.5/blender/config/irix6-config.py 2009-06-08 20:08:19 UTC (rev 20741)
@@ -20,11 +20,6 @@
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
BF_OPENAL_LIBPATH = LIBDIR + '/lib'
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# 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'
Modified: branches/blender2.5/blender/config/linux2-config.py
===================================================================
--- branches/blender2.5/blender/config/linux2-config.py 2009-06-08 19:44:07 UTC (rev 20740)
+++ branches/blender2.5/blender/config/linux2-config.py 2009-06-08 20:08:19 UTC (rev 20741)
@@ -1,9 +1,17 @@
LCGDIR = '../lib/linux2'
LIBDIR = "${LCGDIR}"
+def py_version_string():
+ '''
+ returns py version - "2.5", "2.6" etc
+ '''
+ import platform
+ ver = platform.python_version_tuple()
+ return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6 ints
+
BF_PYTHON = '/usr'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = py_version_string()
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
@@ -18,11 +26,6 @@
BF_OPENAL_LIB = 'openal'
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# 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'
@@ -71,7 +74,8 @@
BF_GETTEXT_LIB = 'gettextlib'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_GAMEENGINE=False
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
WITH_BF_ODE = False
BF_ODE = LIBDIR + '/ode'
Modified: branches/blender2.5/blender/extern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/extern/CMakeLists.txt 2009-06-08 19:44:07 UTC (rev 20740)
+++ branches/blender2.5/blender/extern/CMakeLists.txt 2009-06-08 20:08:19 UTC (rev 20741)
@@ -25,19 +25,20 @@
# ***** END GPL LICENSE BLOCK *****
IF(WITH_GAMEENGINE)
- SUBDIRS(qhull solid)
+ ADD_SUBDIRECTORY(qhull)
+ ADD_SUBDIRECTORY(solid)
ENDIF(WITH_GAMEENGINE)
IF(WITH_BULLET)
- SUBDIRS(bullet2)
+ ADD_SUBDIRECTORY(bullet2)
ENDIF(WITH_BULLET)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- SUBDIRS(binreloc)
+ ADD_SUBDIRECTORY(binreloc)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-SUBDIRS(glew)
+ADD_SUBDIRECTORY(glew)
IF(WITH_OPENJPEG)
- SUBDIRS(libopenjpeg)
+ ADD_SUBDIRECTORY(libopenjpeg)
ENDIF(WITH_OPENJPEG)
Modified: branches/blender2.5/blender/extern/Makefile
===================================================================
--- branches/blender2.5/blender/extern/Makefile 2009-06-08 19:44:07 UTC (rev 20740)
+++ branches/blender2.5/blender/extern/Makefile 2009-06-08 20:08:19 UTC (rev 20741)
@@ -41,9 +41,10 @@
endif
endif
-ifneq ($(NAN_NO_KETSJI), true)
- DIRS += bullet2
-endif
+# Cloth requires it
+#ifneq ($(NAN_NO_KETSJI), true)
+DIRS += bullet2
+#endif
ifeq ($(WITH_BINRELOC), true)
DIRS += binreloc
Modified: branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
===================================================================
--- branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp 2009-06-08 19:44:07 UTC (rev 20740)
+++ branches/blender2.5/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp 2009-06-08 20:08:19 UTC (rev 20741)
@@ -22,13 +22,14 @@
#include "LinearMath/btMinMax.h"
#include <new>
-//-----------------------------------------------------------------------------
+
+//#define CONETWIST_USE_OBSOLETE_SOLVER true
#define CONETWIST_USE_OBSOLETE_SOLVER false
#define CONETWIST_DEF_FIX_THRESH btScalar(.05f)
-//-----------------------------------------------------------------------------
+
btConeTwistConstraint::btConeTwistConstraint()
:btTypedConstraint(CONETWIST_CONSTRAINT_TYPE),
m_useSolveConstraintObsolete(CONETWIST_USE_OBSOLETE_SOLVER)
@@ -63,14 +64,14 @@
m_bMotorEnabled = false;
m_maxMotorImpulse = btScalar(-1);
- setLimit(btScalar(1e30), btScalar(1e30), btScalar(1e30));
+ setLimit(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
m_damping = btScalar(0.01);
m_fixThresh = CONETWIST_DEF_FIX_THRESH;
}
-//-----------------------------------------------------------------------------
+
void btConeTwistConstraint::getInfo1 (btConstraintInfo1* info)
{
if (m_useSolveConstraintObsolete)
@@ -99,10 +100,10 @@
info->nub--;
}
}
-} // btConeTwistConstraint::getInfo1()
+}
-//-----------------------------------------------------------------------------
+
void btConeTwistConstraint::getInfo2 (btConstraintInfo2* info)
{
btAssert(!m_useSolveConstraintObsolete);
@@ -230,8 +231,8 @@
}
}
-//-----------------------------------------------------------------------------
+
void btConeTwistConstraint::buildJacobian()
{
if (m_useSolveConstraintObsolete)
@@ -239,6 +240,7 @@
m_appliedImpulse = btScalar(0.);
m_accTwistLimitImpulse = btScalar(0.);
m_accSwingLimitImpulse = btScalar(0.);
+ m_accMotorImpulse = btVector3(0.,0.,0.);
if (!m_angularOnly)
{
@@ -277,8 +279,8 @@
}
}
-//-----------------------------------------------------------------------------
+
void btConeTwistConstraint::solveConstraintObsolete(btSolverBody& bodyA,btSolverBody& bodyB,btScalar timeStep)
{
if (m_useSolveConstraintObsolete)
@@ -406,10 +408,10 @@
}
}
- else // no motor: do a little damping
+ else if (m_damping > SIMD_EPSILON) // no motor: do a little damping
{
- const btVector3& angVelA = getRigidBodyA().getAngularVelocity();
- const btVector3& angVelB = getRigidBodyB().getAngularVelocity();
+ btVector3 angVelA; bodyA.getAngularVelocity(angVelA);
+ btVector3 angVelB; bodyB.getAngularVelocity(angVelB);
btVector3 relVel = angVelB - angVelA;
if (relVel.length2() > SIMD_EPSILON)
{
@@ -490,16 +492,16 @@
}
-//-----------------------------------------------------------------------------
+
void btConeTwistConstraint::updateRHS(btScalar timeStep)
{
(void)timeStep;
}
-//-----------------------------------------------------------------------------
+
void btConeTwistConstraint::calcAngleInfo()
{
m_swingCorrection = btScalar(0.);
@@ -584,26 +586,47 @@
m_twistAxis.normalize();
}
}
-} // btConeTwistConstraint::calcAngleInfo()
+}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list