svn merge ^/trunk/blender -r41230:41266
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 23:06:27 +0000 (23:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 23:06:27 +0000 (23:06 +0000)
commitda8a7928c91c8b52ca5a8dcc9182777dbc52d744
tree96ca6e95b12afcac1f1cdacdd67b3e82ffd229d9
parent685b6e7db932db179dd2edb1080d3cf6e2bcde2a
parent5b6224c84719213883334bcd9d2c46216053fe35
svn merge ^/trunk/blender -r41230:41266
14 files changed:
intern/itasc/ConstraintSet.cpp
intern/itasc/ControlledObject.cpp
intern/itasc/CopyPose.cpp
intern/itasc/Scene.cpp
intern/itasc/WDLSSolver.cpp
intern/itasc/WSDLSSolver.cpp
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/library.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/math_vector_inline.c
source/blender/imbuf/intern/moviecache.c
source/blender/render/intern/source/convertblender.c