merge trunk 16118 -> 116886
authorMartin Poirier <theeth@yahoo.com>
Thu, 2 Oct 2008 20:39:57 +0000 (20:39 +0000)
committerMartin Poirier <theeth@yahoo.com>
Thu, 2 Oct 2008 20:39:57 +0000 (20:39 +0000)
commitc35a2d6ea9dc5226911bd90848e96a59233bdaf8
treebe895ae3982a72a5b1cfd4ff9b1766037c07a6d0
parent39e66e4d6f48b7a54a510ec5504fd500cc07174f
parent06c43148a19ad7e8cddf9ba51549b51bdb1f6f0c
merge trunk 16118 -> 116886
18 files changed:
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/include/BIF_editarmature.h
source/blender/include/butspace.h
source/blender/makesdna/DNA_scene_types.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/Converter/BL_ShapeDeformer.h
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp