[Bf-blender-cvs] [6ecafc5] openvdb: Merge branch 'master' into openvdb

[Lukas Tönne]

Commit: 6ecafc57f1f778b4a9e125cb6a0c9f632a20f295
Author: Lukas Tönne
Date:   Thu Jun 11 10:47:33 2015 +0200
Branches: openvdb
https://developer.blender.org/rB6ecafc57f1f778b4a9e125cb6a0c9f632a20f295

Merge branch 'master' into openvdb

===================================================================



===================================================================