svn merge ^/trunk/blender -r43664:43676
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 20:19:09 +0000 (20:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 20:19:09 +0000 (20:19 +0000)
commitd3090a32f2dffc0e5fc3eb47bb2964ddf1e5a462
tree40e1479fd1b8da7b1c8dbbbeffcca961cb0a341e
parent3d01f13c43a38811e000de9e5bf6d6b4319b7859
parent439e9a39a8dd16076648d8e3eaa6a721ce349a57
svn merge ^/trunk/blender -r43664:43676
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/curve/editfont.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/object/object_modifier.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/drawobject.c