svn merge ^/trunk/blender -r42617:42655
authorCampbell Barton <ideasman42@gmail.com>
Thu, 15 Dec 2011 23:59:02 +0000 (23:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 15 Dec 2011 23:59:02 +0000 (23:59 +0000)
commit862dc635ed98c6d1ffc7c755058c682021da4c6b
tree11de5533aaae2da3eab2ab63c5d5977aea73dbc4
parentd0b70cffaf99321c57045d8dc8ec197b1542395c
parent0dbd9ea73f7f86e02d9aae6c65c3ce5e3c4ecd4b
svn merge ^/trunk/blender -r42617:42655
19 files changed:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/deform.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/curve/editcurve.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/makesrna/intern/rna_object_api.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_smooth.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/intern/wm_init_exit.c