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

[Kévin Dietrich]

Commit: f52720d2043d956e891a91a5c5c838e35ddf1bd9
Author: Kévin Dietrich
Date:   Sat Dec 5 04:39:53 2015 +0100
Branches: openvdb
https://developer.blender.org/rBf52720d2043d956e891a91a5c5c838e35ddf1bd9

Merge branch 'master' into openvdb

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



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