svn merge ^/trunk/blender -r42669:42670
authorCampbell Barton <ideasman42@gmail.com>
Fri, 16 Dec 2011 23:50:55 +0000 (23:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 16 Dec 2011 23:50:55 +0000 (23:50 +0000)
commitdb6cb30941da7899ccafa44c87c17970d134a2c9
tree0f1c3df62346cfac61e2785e9ec7ac8e0e30f443
parente5b1f9c28d52254fd11e226ed4ac7bf07d7259d7
parent3311164b24da61f2967f96d0ee27508a7e2e0267
svn merge ^/trunk/blender -r42669:42670
32 files changed:
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/knifetool.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_hook.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/makesrna/intern/rna_object.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/blender/modifiers/intern/MOD_cast.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_warp.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/strand.c