Merging with trunk
authorMartin Poirier <theeth@yahoo.com>
Tue, 5 Aug 2008 02:27:09 +0000 (02:27 +0000)
committerMartin Poirier <theeth@yahoo.com>
Tue, 5 Aug 2008 02:27:09 +0000 (02:27 +0000)
commite2380665259eb0f74376ffda2ab791ba8e1bb9ef
treeac5134d6f03956f51e4498e828143482d36287fa
parentd4b646103a6cae433d58bf7e2f4953f81358835b
parent07bc1e56fec864748c160af02659e3fcff317be9
Merging with trunk
15568 - 15963
13 files changed:
source/blender/blenlib/intern/arithb.c
source/blender/include/BIF_editarmature.h
source/blender/src/buttons_editing.c
source/blender/src/drawview.c
source/blender/src/editarmature.c
source/blender/src/usiblender.c
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.h
source/gameengine/Converter/BL_ShapeDeformer.cpp
source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
source/gameengine/GameLogic/SCA_ActuatorEventManager.h
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.h