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

[Kévin Dietrich]

Commit: bdb12bf045ad29b75db4ea8fded71152395725d7
Author: Kévin Dietrich
Date:   Fri Jul 17 20:21:27 2015 +0200
Branches: openvdb
https://developer.blender.org/rBbdb12bf045ad29b75db4ea8fded71152395725d7

Merge branch 'master' into openvdb

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



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