small merge needed for testing new animsys in 2.5 BGE, mixing own changes with merge...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jun 2009 19:51:58 +0000 (19:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jun 2009 19:51:58 +0000 (19:51 +0000)
commitecb39291e97742524ff6b091bbca22a5a915f92c
tree360f919c519ce19564064757c8bdf578ab7fa566
parent55f1a1dcad5621f323dd76ca3cfcec06677e00be
parent2faf20c4b3ae1ca6c82dd2a942d2f2a580685436
small merge needed for testing new animsys in 2.5 BGE, mixing own changes with merge can be a hassle.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20928:20937
source/blender/blenkernel/intern/action.c
source/gameengine/Converter/BL_ActionActuator.cpp