svn merge -r 15292:15392 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 30 Jun 2008 22:57:52 +0000 (22:57 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 30 Jun 2008 22:57:52 +0000 (22:57 +0000)
commitc7dbc6548811f37bfeda4013ab70e342d50707b7
tree4b85e06024dfe328f686ae82d3a413d4f7c2d85c
parent09c898bd65069ec75a38f6ad28ced45454d87720
svn merge -r 15292:15392 https://svn.blender.org/svnroot/bf-blender/trunk/blender
144 files changed:
extern/libredcode/debayer.c
intern/iksolver/intern/IK_QTask.h
intern/moto/include/MT_random.h
intern/moto/intern/MT_random.cpp
projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
release/scripts/DirectX8Exporter.py
release/scripts/animation_bake_constraints.py [new file with mode: 0644]
release/scripts/bpymodules/BPyArmature.py
release/scripts/c3d_import.py [new file with mode: 0644]
source/blender/blenkernel/BKE_ipo.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/text.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/imbuf/IMB_imbuf_types.h
source/blender/imbuf/intern/IMB_anim.h
source/blender/imbuf/intern/anim.c
source/blender/include/BIF_butspace.h
source/blender/include/BIF_interface.h
source/blender/include/BIF_oops.h
source/blender/include/butspace.h
source/blender/include/transform.h
source/blender/makesdna/DNA_actuator_types.h
source/blender/makesdna/DNA_controller_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_sensor_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/nodes/intern/CMP_nodes/CMP_math.c
source/blender/python/api2_2x/CurNurb.c
source/blender/python/api2_2x/Lamp.c
source/blender/python/api2_2x/Mathutils.c
source/blender/python/api2_2x/doc/Curve.py
source/blender/render/intern/source/pipeline.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_logic.c
source/blender/src/buttons_scene.c
source/blender/src/drawaction.c
source/blender/src/drawview.c
source/blender/src/editaction.c
source/blender/src/editfont.c
source/blender/src/editmesh_mods.c
source/blender/src/editobject.c
source/blender/src/editseq.c
source/blender/src/editsima.c
source/blender/src/interface.c
source/blender/src/oops.c
source/blender/src/poseobject.c
source/blender/src/sequence.c
source/blender/src/space.c
source/blender/src/transform.c
source/blender/src/transform_constraints.c
source/blender/src/transform_generics.c
source/blender/src/transform_snap.c
source/blender/src/view.c
source/creator/creator.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_ShapeDeformer.cpp
source/gameengine/Converter/BL_ShapeDeformer.h
source/gameengine/Converter/BL_SkinDeformer.cpp
source/gameengine/Converter/BL_SkinDeformer.h
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/KX_ConvertControllers.cpp
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Expressions/Value.cpp
source/gameengine/Expressions/Value.h
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
source/gameengine/GameLogic/SCA_2DFilterActuator.h
source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
source/gameengine/GameLogic/SCA_AlwaysSensor.h
source/gameengine/GameLogic/SCA_IActuator.cpp
source/gameengine/GameLogic/SCA_IActuator.h
source/gameengine/GameLogic/SCA_IController.cpp
source/gameengine/GameLogic/SCA_IController.h
source/gameengine/GameLogic/SCA_IObject.cpp
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/GameLogic/SCA_ISensor.cpp
source/gameengine/GameLogic/SCA_ISensor.h
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.h
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.h
source/gameengine/GameLogic/SCA_LogicManager.cpp
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.h
source/gameengine/GameLogic/SCA_NANDController.cpp [new file with mode: 0644]
source/gameengine/GameLogic/SCA_NANDController.h [new file with mode: 0644]
source/gameengine/GameLogic/SCA_NORController.cpp [new file with mode: 0644]
source/gameengine/GameLogic/SCA_NORController.h [new file with mode: 0644]
source/gameengine/GameLogic/SCA_PropertySensor.cpp
source/gameengine/GameLogic/SCA_PropertySensor.h
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_PythonController.h
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/GameLogic/SCA_RandomSensor.h
source/gameengine/GameLogic/SCA_XNORController.cpp [new file with mode: 0644]
source/gameengine/GameLogic/SCA_XNORController.h [new file with mode: 0644]
source/gameengine/GameLogic/SCA_XORController.cpp [new file with mode: 0644]
source/gameengine/GameLogic/SCA_XORController.h [new file with mode: 0644]
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.h
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
source/gameengine/Ketsji/KX_BulletPhysicsController.h
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_IPhysicsController.h
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.h
source/gameengine/Ketsji/KX_ObjectActuator.cpp
source/gameengine/Ketsji/KX_ObjectActuator.h
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RaySensor.cpp
source/gameengine/Ketsji/KX_RaySensor.h
source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp [new file with mode: 0644]
source/gameengine/Ketsji/KX_SCA_DynamicActuator.h [new file with mode: 0644]
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_StateActuator.cpp [new file with mode: 0644]
source/gameengine/Ketsji/KX_StateActuator.h [new file with mode: 0644]
source/gameengine/Ketsji/KX_SumoPhysicsController.h
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_TouchSensor.h
source/gameengine/PyDoc/KX_GameObject.py
source/gameengine/PyDoc/SCA_PythonController.py
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_2DFilterManager.h
source/gameengine/Rasterizer/RAS_IRenderTools.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp