Blender Git Commit Log

Git Commits -> Revision 7499860

Revision 7499860 by Campbell Barton (apricot)
July 4, 2008, 10:31 (GMT)
svn merge -r15399:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
manually merged source/gameengine

Commit Details:

Full Hash: 7499860e8056d4b0ce4f647d45753807cfa2bbf7
SVN Revision: 15426
Parent Commit: 9907889
Lines Changed: +3300, -908

6 Added Paths:

/source/blender/render/intern/include/sunsky.h (+141, -0) (View)
/source/blender/render/intern/source/sunsky.c (+492, -0) (View)
/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp (+76, -0) (View)
/source/gameengine/GameLogic/SCA_ActuatorEventManager.h (+52, -0) (View)
/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp (+196, -0) (View)
/source/gameengine/GameLogic/SCA_ActuatorSensor.h (+74, -0) (View)

54 Modified Paths:

/projectfiles_vc7/blender/render/BRE_render.vcproj (+7, -1) (Diff)
/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj (+12, -0) (Diff)
/release/windows/installer/00.sconsblender.nsi (+15, -10) (Diff)
/source/blender/blenkernel/BKE_cloth.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/cloth.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/collision.c (+261, -206) (Diff)
/source/blender/blenkernel/intern/implicit.c (+10, -3) (Diff)
/source/blender/blenkernel/intern/object.c (+11, -0) (Diff)
/source/blender/blenkernel/intern/sca.c (+3, -0) (Diff)
/source/blender/blenlib/BLI_arithb.h (+3, -0) (Diff)
/source/blender/blenlib/intern/arithb.c (+60, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+17, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+3, -0) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+28, -10) (Diff)
/source/blender/makesdna/DNA_lamp_types.h (+19, -0) (Diff)
/source/blender/makesdna/DNA_sensor_types.h (+7, -0) (Diff)
/source/blender/python/BPY_interface.c (+15, -10) (Diff)
/source/blender/render/intern/include/pixelshading.h (+1, -0) (Diff)
/source/blender/render/intern/include/render_types.h (+4, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+25, -1) (Diff)
/source/blender/render/intern/source/pixelshading.c (+76, -2) (Diff)
/source/blender/render/intern/source/rendercore.c (+91, -0) (Diff)
/source/blender/src/buttons_logic.c (+229, -71) (Diff)
/source/blender/src/buttons_shading.c (+41, -0) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+92, -38) (Diff)
/source/gameengine/Converter/KX_ConvertSensors.cpp (+14, -0) (Diff)
/source/gameengine/Expressions/PyObjectPlus.h (+27, -0) (Diff)
/source/gameengine/GameLogic/SCA_EventManager.cpp (+3, -1) (Diff)
/source/gameengine/GameLogic/SCA_EventManager.h (+3, -1) (Diff)
/source/gameengine/GameLogic/SCA_ILogicBrick.cpp (+4, -8) (Diff)
/source/gameengine/GameLogic/SCA_ILogicBrick.h (+2, -2) (Diff)
/source/gameengine/GameLogic/SCA_IObject.cpp (+17, -17) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.cpp (+2, -1) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.h (+3, -0) (Diff)
/source/gameengine/GameLogic/SCA_JoystickSensor.cpp (+7, -1) (Diff)
/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp (+10, -7) (Diff)
/source/gameengine/GameLogic/SCA_LogicManager.cpp (+4, -0) (Diff)
/source/gameengine/GameLogic/SCA_MouseSensor.cpp (+9, -3) (Diff)
/source/gameengine/GameLogic/SCA_PropertySensor.cpp (+5, -2) (Diff)
/source/gameengine/GameLogic/SCA_PythonController.cpp (+29, -50) (Diff)
/source/gameengine/GameLogic/SCA_PythonController.h (+9, -12) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.cpp (+479, -97) (Diff)
/source/gameengine/Ketsji/KX_ConstraintActuator.h (+53, -6) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+185, -191) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+32, -35) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+2, -3) (Diff)
/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp (+7, -1) (Diff)
/source/gameengine/Ketsji/KX_NearSensor.cpp (+1, -4) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.cpp (+266, -97) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.h (+15, -4) (Diff)
/source/gameengine/Ketsji/KX_RaySensor.cpp (+8, -2) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_TouchSensor.cpp (+7, -5) (Diff)
/source/gameengine/PyDoc/KX_GameObject.py (+30, -3) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021