Campbell Barton da8a7928c9 svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

..

kdl

svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full

2011-10-24 22:18:32 +00:00

Armature.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Armature.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Cache.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Cache.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

ConstraintSet.cpp

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

ConstraintSet.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

ControlledObject.cpp

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

ControlledObject.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

CopyPose.cpp

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

CopyPose.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Distance.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Distance.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

eigen_types.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

eigen_types.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

FixedObject.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

FixedObject.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

MovingFrame.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

MovingFrame.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Object.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

Scene.cpp

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

Scene.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

SConscript

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

Solver.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

ublas_types.hpp

Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.

2009-09-24 21:22:24 +00:00

UncontrolledObject.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

UncontrolledObject.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

WDLSSolver.cpp

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

WDLSSolver.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

WorldObject.cpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

WorldObject.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

WSDLSSolver.cpp

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

WSDLSSolver.hpp

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00