svn merge ^/trunk/blender -r49024:49029
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 12:56:36 +0000 (12:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 12:56:36 +0000 (12:56 +0000)
commit6dc50955d776a2d426cbe288c1b665e443bc9b30
tree4ae5546fa7f632ed572f4cc4c8917e5131243a7d
parent1f66c7eeca14eb58f3d4ca52b8833067f9c6ad13
parentcfb3194945ee9c8bde2a5ce11c1dc05ae944920f
svn merge ^/trunk/blender -r49024:49029