svn merge -r41310:41329 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 05:17:09 +0000 (05:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 05:17:09 +0000 (05:17 +0000)
commitff837cbe9b2a27678a6111207ce60b64f44d5917
treede1f188ed4d2b0659a8ebecb3a1e8b4792483065
parentc914b11614fff23bca5b601da24f02ab51b9db52
parent4b635d16316d12dd4c57e1dcf99092551e6bbe35
svn merge -r41310:41329 ^/trunk/blender
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/library.c
source/blender/editors/curve/editfont.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_lattice.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image.c