svn merge ^/trunk/blender -r42967:42973
authorCampbell Barton <ideasman42@gmail.com>
Thu, 29 Dec 2011 12:17:45 +0000 (12:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 29 Dec 2011 12:17:45 +0000 (12:17 +0000)
1  2 
source/blender/blenkernel/intern/customdata.c
source/blender/editors/curve/editfont.c