svn merge -r40140:r40148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Sep 2011 04:57:20 +0000 (04:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Sep 2011 04:57:20 +0000 (04:57 +0000)
commitfddc655aec15510b5bb7adfa4cc66d14070576df
tree13c53b94183caedc7625d23db8b4b0b06414a34b
parent2fa642b6e9f4e40aa3a2b90c49374ba91d15a14a
parent9a1f3c587e366fb555696b27c77ed456ffc15f7d
svn merge -r40140:r40148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
17 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/math_vector_inline.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/transform/transform_snap.c
source/blender/modifiers/intern/MOD_weightvgproximity.c