svn merge -r41329:41335 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 12:57:37 +0000 (12:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 12:57:37 +0000 (12:57 +0000)
commit07019829339242d5155e08daddec4366c6def907
treec0ab3791d4d4d2e989fd2fece114e722efdc7dcb
parentf5cf23888490c85cb7a23f05259daff6e369cbac
parent0d63bb005ff7c45ca0ebcfbe4eaf1215dfe2d3e2
svn merge -r41329:41335 ^/trunk/blender
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp