svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 May 2011 04:35:21 +0000 (04:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 May 2011 04:35:21 +0000 (04:35 +0000)
commit671cb93f1b38b28fbc349d6a6646f8bea83ebccd
tree8921ee06a67273f2a3d6b38cf2dc459aca944273
parent94b8a81c17e835f0c5185e5396b06ddcb2f684ce
parent1e00590f1c2f8d98ed52f8e12d70723165edc9d3
svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender
30 files changed:
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/knifetool.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/DNA_userdef_types.h
source/creator/creator.c