svn merge ^/trunk/blender -r42221:42245
authorCampbell Barton <ideasman42@gmail.com>
Tue, 29 Nov 2011 06:58:16 +0000 (06:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 29 Nov 2011 06:58:16 +0000 (06:58 +0000)
commit5380545c9780c8aabf050f0bdd4a547f45d9794e
tree0dca31a32af4cf3b6c53ab984a856dbf224c4931
parente3c6e47a382e6a8c92482cda048b396e0e9cc581
parent3f57c06c7b8f01e16109c8bdbaba9643fe380d3c
svn merge ^/trunk/blender -r42221:42245
release/scripts/startup/bl_ui/space_info.py
source/blender/blenkernel/intern/anim.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_add.c
source/blender/editors/sculpt_paint/paint_vertex.c