Blender Git Loki
Git Commits -> Revision afc30d1
Revision afc30d1 by Andre Susano Pinto (master) July 15, 2008, 12:54 (GMT) |
There was a problem with the last merge :S Somehow it didnt finished and didnt added some files under the svn control (found thanks to lguillaume that reported some files were missing) Last merge fixed and also merged modifications up to revision 15584. I checked the diff svn diff --new . --old https://svn.blender.org/svnroot/bf-blender/trunk/blender And everything seems to be right now |
Commit Details:
Full Hash: afc30d1a33506d8c0fb08f6b2df7856071383430
SVN Revision: 15585
Parent Commit: 785123c
Lines Changed: +1453, -76
9 Added Paths:
/release/scripts/scripttemplate_ipo_gen.py (+92, -0) (View)
/source/blender/blenlib/BLI_mempool.h (+44, -0) (View)
/source/blender/blenlib/intern/BLI_mempool.c (+140, -0) (View)
/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)
/source/blender/blenlib/BLI_mempool.h (+44, -0) (View)
/source/blender/blenlib/intern/BLI_mempool.c (+140, -0) (View)
/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)
19 Modified Paths:
/CMakeLists.txt (+23, -4) (Diff)
/intern/bsp/intern/BSP_CSGMesh.cpp (+1, -1) (Diff)
/intern/container/CTR_TaggedIndex.h (+16, -0) (Diff)
/intern/decimation/intern/LOD_ManMesh2.cpp (+3, -3) (Diff)
/intern/elbeem/intern/solver_init.cpp (+1, -1) (Diff)
/intern/ghost/intern/GHOST_SystemWin32.cpp (+8, -0) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+8, -0) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.cpp (+1, -1) (Diff)
/source/blender/render/intern/source/zbuf.c (+16, -8) (Diff)
/source/blender/src/buttons_editing.c (+2, -2) (Diff)
/source/blender/src/buttons_scene.c (+39, -33) (Diff)
/source/blender/src/transform_conversions.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+10, -1) (Diff)
/source/gameengine/GameLogic/SCA_PythonController.cpp (+9, -5) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+4, -1) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+1, -12) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.h (+0, -1) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.cpp (+2, -1) (Diff)
/intern/bsp/intern/BSP_CSGMesh.cpp (+1, -1) (Diff)
/intern/container/CTR_TaggedIndex.h (+16, -0) (Diff)
/intern/decimation/intern/LOD_ManMesh2.cpp (+3, -3) (Diff)
/intern/elbeem/intern/solver_init.cpp (+1, -1) (Diff)
/intern/ghost/intern/GHOST_SystemWin32.cpp (+8, -0) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+8, -0) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.cpp (+1, -1) (Diff)
/source/blender/render/intern/source/zbuf.c (+16, -8) (Diff)
/source/blender/src/buttons_editing.c (+2, -2) (Diff)
/source/blender/src/buttons_scene.c (+39, -33) (Diff)
/source/blender/src/transform_conversions.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+10, -1) (Diff)
/source/gameengine/GameLogic/SCA_PythonController.cpp (+9, -5) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+4, -1) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+1, -12) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.h (+0, -1) (Diff)
/source/gameengine/Ketsji/KX_SoundActuator.cpp (+2, -1) (Diff)