svn merge ^/trunk/blender -r42586:42617
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 Dec 2011 00:30:31 +0000 (00:30 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 Dec 2011 00:30:31 +0000 (00:30 +0000)
commita3bdb2d8256263c7cf8eea21f4ba89c7a38e483f
tree13bb97b5f9d9d3a71b150459f38149dd5d23557e
parent6254cc1c70b06acd60131b9ae3b0993e258e4e33
parenta7823dda6941420ba1317ac3682c8b563a47023c
svn merge ^/trunk/blender -r42586:42617
source/blender/blenkernel/BKE_blender.h