Blender Git Loki

Merge branch 'master' into openvdb

Fix possible null pointer dereferencing.

When copy-pasting goes bad, though it's unlikely they'll be null.

Cleanup: self assignement/initialization.

Cleanups:

- rework includes order in intern/openvdb: first include should be the
source file's header, then other header in the same directory, following
by system/library headers and finally other local headers.

- move ScopeTimer cdtor definitions to openvdb_util.cc, no reason for
them to be in a header.

- add a DEBUG_TIME macro to switch Timer macro on and off instead of
using NDEBUG macro (doesn't make much sense to time in debug mode)

Merge branch 'master' into openvdb

Merge branch 'master' into openvdb

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Merge branch 'master' into openvdb

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Initial work to perform volume ray intersection next to the bvh intersection

Merge branch 'master' into openvdb

Remove 'OPENVDB_USE_BLOSC' from SConscripts as well

Merge branch 'master' into openvdb

OpenVDB 3.1 update.

This commit makes it so OpenVDB 3.1 is to used for compilation (the
current dev version at the time of the commit).

Changes are as follows:

- remove OPENVDB_USE_BLOSC, as this was due to a bug which "required"
client code to define this when it was also defined on OpenVDB's side.
- Cycles: make use of floating-point precision rays and volume
intersectors.

Merge branch 'master' into openvdb

Merge branch 'master' into openvdb