Blender Git Loki

Fix OpenVDB socket creation in the Cycles node.

Was always using the last socket name, so other grids could not be accessed.

Merge branch 'master' into openvdb

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/render/nodes.cpp

Comment.

Try to sample VDB volumes through the attribute node.

Fix compile error.

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Conflicts:
source/blender/blenloader/intern/writefile.c

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/app/cycles_xml.cpp

Merge branch 'openvdb' into cvdb_ray_isect

Conflicts:
intern/cycles/kernel/kernel_textures.h
intern/cycles/kernel/kernel_volume.h
intern/cycles/render/attribute.cpp
intern/cycles/render/scene.h
intern/cycles/render/session.cpp
intern/cycles/render/shader.cpp
intern/cycles/util/util_task.cpp

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/kernel_globals.h
intern/cycles/kernel/osl/osl_services.cpp
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/svm.cpp
intern/cycles/util/util_task.cpp

Fix assert failure.

Clear map when releasing memory, add some debug prints.

Fix thread_ids vector having the wrong size.

Fix crash derefencing nullptrs.

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/kernel_globals.h
intern/cycles/util/util_task.cpp

Merge branch 'openvdb' into cvdb_ray_isect