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)
1  2 
source/blender/blenkernel/BKE_blender.h