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

[Kévin Dietrich]

Commit: eae5f5b7d7c3bbf4c729d5d3f108a17d5378fc33
Author: Kévin Dietrich
Date:   Thu Jul 16 05:00:23 2015 +0200
Branches: openvdb
https://developer.blender.org/rBeae5f5b7d7c3bbf4c729d5d3f108a17d5378fc33

Merge branch 'master' into openvdb

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



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