Blender Git Loki

Merge remote-tracking branch 'origin/master' into openvdb

Removed the deprecated OpenVDB shader node for direct loading of .vdb files.

This node was already disabled. All vdb data should eventually be loaded
through the Cycles sync procedure as object data.

Specialized nodes for accessing voxel data may eventually be added again
for convenience, but these would just be advanced attribute nodes.

Merge branch 'master' into openvdb

Fix double freeing of OpenVDB data from dangling pointers in device data.

Move registration of volumes from attributes out of the smoke sim logic.

This bit of code will be the same for every potential source of volumetric
data.

Cleanup of Blender sync code for OpenVDB volume attributes.

Besides removing some debug printing lines, the code should also become
easier to adapt to alternative sources of volume data beside the smoke sim.

Use tri-linear ("box") interpolation for OpenVDB grids rather than nearest point sampling.

Cycles shading options contain a setting for tri-cubic sampling as well, but this
is not supported in OpenVDB by default (only tri-quadratic). Cubic sampling appears
a bit pointless anyway, compared to the ability to add actual geometric detail.

Merge branch 'master' into openvdb

Fix voxel attribute sampling position when using VDB grids.

OpenVDB handles inverse transform from object to grid space internally.

Removed unused util_volume files.

Merge branch 'cvdb_ray_isect' into openvdb

Set the primitive type for volume samples to VOLUME.

This is so the primitive_attribute_* functions correctly look for
voxel attributes.

Fix various cleanup issues and inconsistencies.

All volumes are held in the scene volumes list now, so VolumeManager doesn't need
to free them explicitly.

The ImageManager reference in VoxelAttribute is an artifact from smoke rendering,
this should be phased out eventually and can be assumed to be NULL for Volumes.

Make sure the VolumeManager cleans up the device memory properly, in particular
the ray intersector instances must be freed.

Proper volume data storage in Cycles when syncing from Blender data.

Previously a viewport render would continuously keep adding Volume instances
to the VolumeManager data, because there was no way to detect existing volume
data. Now the `id_map` model known from meshes and other data types is used for
volume data as well.

Note that the VolumeKey currently simply uses an Object ID pointer, thus
assuming a single Volume per object. In the future volumes could become a
real ID type in Blender, or the specific volume could be narrowed down with
additional info in the key.

Added an assert to catch non-uniform grids earlier.

OpenVDB ray intersectors only support uniform grids. This should be
checked as early as possible to allow feedback to the Cycles user
(i.e. the Blender app). For now the assert just prevents exceptions
from OpenVDB itself, until a transparent mechanism for this is implemented.

Removed direct grid lists in VolumeManager, all grids should be in Volumes now.

Disables VolumeManager functions that load grids directly from a filename.

These are legacy functions from the OpenVDB import node, but they don't
work with the new design any more because there is no specific Volume
instance to add the grids to.

Improved thread data handling for the OpenVDB Cycles node.

OpenVDB grid accessors, samplers, and ray intersectors must be stored per thread.
Previously this data was stored in a per-thread map in each grid. This causes problems
because the pthread_id keys can become invalid, and it also creates a lot of unused
accessors.

The patch switches thread data storage around, so that thread-local data is now passed
along KernelGlobals for every work task as needed (tasks only run in one thread).
This system is much more reliable and similar to other cases of thread-local data,
such as OSL shaders.

The patch also removes the virtual base class for "volumes", which might give a minor
performance improvement. If a generic volume type for Cycles is needed it can be
abstracted from scratch.

Removed the unused thread_id list in Cycles CPU tasks, which were only needed
for the now deprecated OpenVDB grid accessor lookup.

Merge branch 'master' into cvdb_ray_isect

Fix invalid default value type when constructing a default volume shader graph.