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)
commita95407752add78f46d18e4de58402dfa0e5d8369
tree99aeb3d61b065b50eaae71b22c68aea9ecf1df79
parent45f1d7fa175c59b74e82fe9262c46393108767af
parente63cb930ae6ab0fe2f2bfb97abc7b9b1dd19f6a8
svn merge ^/trunk/blender -r42967:42973
source/blender/blenkernel/intern/customdata.c
source/blender/editors/curve/editfont.c