merge with trunk (15330 -> 15566)
authorMartin Poirier <theeth@yahoo.com>
Mon, 14 Jul 2008 14:09:36 +0000 (14:09 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 14 Jul 2008 14:09:36 +0000 (14:09 +0000)
commit84ae0fc00092ac2020ae56802d2c8a103b8a7929
tree5477aed92a348be1cb89f2b3a9555b50fc1169b7
parent915baebda66c1ac2f75497f47f76a9d5a502836b
parentd50d175ba16b5e4392697e7195bef77fbb1afd95
merge with trunk (15330 -> 15566)
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_ShapeDeformer.cpp
source/gameengine/Converter/BL_ShapeDeformer.h