Blender Git Loki

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/space_file/file_ops.c

Merge branch 'master' into opensubdiv-modifier

Conflicts:
CMakeLists.txt
SConstruct
build_files/cmake/macros.cmake
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_extensions.h
source/blender/gpu/GPU_material.h
source/blender/gpu/SConscript
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_codegen.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript

Merge branch 'master' into gooseberry

Don't use number of frames for image collapse for now

Strictly collapse images

Merge branch 'master' into openvdb

Several fixes and cleanups to the compile process:

- disable exceptions in tbb for cycles due to typeid usage
- cleanup SConscript in intern/openvdb, and make others align with
CMakeLists
- import fixes from gooseberry branch by sergey
- fix compilation error when cycles logging is disabled
- avoid unnecessary includes if building without openvdb

Fix opengl matrix underflow with overdrop

Gooseberry: Add missing include paths to GLEW

Gooseberry: Attempt to fix compilation with MSVS

M_PI macro requires BLI_math.h to be included.

Gooseberry: Attempt to fix compilation error on OSX

There's in fact a conflict bewteeb math.h's isfinite and STL's one
which wasn't an issue previously because stl was not really included
into kernel for until openvdb work.

This commit only works issue around, proper solution is still needed.

P.S. It's still a good idea to not include headers which are unused
by current configuration anyway.

Gooseberry: Fix compilation with OpenVDB disabled

It was giving an issues when building with SCons and disabled OpenVDB.

Likely need to be backported to openvdb branch.

A simple UI for the VDB tree visualization.

Merge branch 'master' into gooseberry

crash fix, do not reset shards in dynamic fracture

automatically trigger entire clusters now, if any

Merge branch 'master' into openvdb

Add extra metadatas to the grids:

- set vector type for scalar grids as well
- set vector grids class to GRID_STAGGERED, this might become an option/
function parameter at some point.

Cycles: add support for sampling staggered vector grids.

Cycles: rename openvdb.* files to volume.*