svn merge ^/trunk/blender -r42660:42669
authorCampbell Barton <ideasman42@gmail.com>
Fri, 16 Dec 2011 23:26:29 +0000 (23:26 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 16 Dec 2011 23:26:29 +0000 (23:26 +0000)
commite5b1f9c28d52254fd11e226ed4ac7bf07d7259d7
treeb3a36c302cf470ed5e7c7a195e760623c82bbc7e
parentd46712cd298f59405646fc44acef52fbb11d2f82
parent3c8ab559a5bd31fd38e9c5cf9da8505ca28f4887
svn merge ^/trunk/blender -r42660:42669
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenlib/intern/math_base_inline.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_buttons.c