Blender Git Loki

Merge branch 'openvdb' into gooseberry

Fix for missing boost dependency when OpenVDB is disabled.

Merge branch 'openvdb' into gooseberry

Fix compilation error when WITH_OPENVDB is off (again).

Merge branch 'openvdb' into gooseberry

OpenVDB has a dependency on boost-iostreams lib.

Blender needs to link this for static OpenVDB libraries.

Merge branch 'openvdb' into gooseberry

Conflicts:
source/blender/makesdna/DNA_smoke_types.h

Fix for bad level function implementation.

Was declared in BKE, but implemented in editors, giving undefined
references in the player.

Revert "Fix for undefined reference for a smoke function in the player."

This reverts commit 309f15b8f4020157b5ff04fc2c7a0616b0632586.

Fix for undefined reference for a smoke function in the player.

Gooseberry: Fix compilation error with OpenVDB disabled

Initial support for drawing the VDB tree in the viewport.

To make it possible an OpenVDBPrimitive onject is introduced which hides
a shared pointer to an openvdb::GridBase so it's a bit generic, but by
far not final.

The drawing code is a bit hackish on the side, but at least it works and
here's an example: http://www.pasteall.org/pic/show.php?id=89278

NOTE: This only works when the simulation is imported back in.

Move exported flag from SmokeDomainSettings to OpenVDBCache

Gooseberry: Fix compilation error with OpenVDB disabled

Disable OpenVDB on buildbots for OSX and Windows, until libraries for
these environments are available.

Merge branch 'openvdb' into gooseberry

Conflicts:
build_files/buildbot/config/user-config-player-glibc211-i686.py
build_files/buildbot/config/user-config-player-glibc211-x86_64.py
build_files/scons/tools/Blender.py
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/svm/svm_types.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/smoke.c
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_smoke.c

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/idcode.c
source/blender/editors/interface/interface_templates.c

Merge branch 'master' into openvdb

Super hacky hack (not for master for sure) to stop blender for crashing
with scene audio recursion in mattieu's gooseberry edit in sequencer.

Will probably cause something else to explode but let's just guard
against this in the audio lib for now.

OpenVDB: Disable it for blenderplayer buildbot target