Blender Git Loki

Use '-' instead of '..' as a range separator for the cache slice
operator.

Fix for invalid sample indices.

Extended frame selection for the cache slice operator to support
multiple frame ranges.

Caches can generally be constructed using an arbitrary subset of samples
from the original file. It's mostly a matter of operator UI how this
can be defined by users.

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/gpu/GPU_buffers.h
source/blender/physics/intern/BPH_mass_spring.cpp

Merge branch 'master' into gooseberry

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

Strictly collapse images

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.

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_clip/clip_draw.c
source/blender/imbuf/intern/anim_movie.c
source/blender/windowmanager/intern/wm_playanim.c

Merge branch 'openvdb' into gooseberry

Fix for own commit: cycles volume slots are not the same as the index
in the openvdb grids array.

Merge branch 'openvdb' into gooseberry

Fix for undefined density slot when using OpenVDB nodes without
connecting the density socket.

The density grid is used for the primary intersection tests, so it needs
to be identified among others. The slot index used before was not
initialized when the density node socket is not connected. Further and
invalid index (-1) is not recognized and leads to buffer underrun.

Merge branch 'master' into gooseberry