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

[Kévin Dietrich]

Commit: 069c867eb787159f43557c2a011f3dedad50e65b
Author: Kévin Dietrich
Date:   Tue Nov 24 12:49:53 2015 +0100
Branches: openvdb
https://developer.blender.org/rB069c867eb787159f43557c2a011f3dedad50e65b

Merge branch 'master' into openvdb

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



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