Blender Git Loki

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

Cycles: Added option for custom texture cache path.

Cycles: Texture Cache toggle is now properly updated.

Cycles: Fixed OpenCL kernel build on Windows.

Cycles: Fixed build on Linux and OpenCL.

Cycles: Fixed texture caching when using the new displacement nodes.

Merge branch 'cycles_texture_cache' of git.blender.org:blender into cycles_texture_cache

Cycles: Implmemented texture filtering for box mapping.

Cycles: Improved ray differentials for volume scattering.

Cycles: Fixes for OSL with texture caching: Textures are now right side up again and textures read from the cache are assumed to be linear.

Cycles: Set proper defaults for texture caching.

Cycles: Setting dNdx/dNdy to zero for flat shaded surfaces.

Cycles: Fixed uninitialised variable.

Cycles: Fixed swapped parameters in fresnel_dielectric().

Cycles: Moved Texture caching options to their own subsection in the UI.

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

# Conflicts:
# intern/cycles/render/image.cpp
# intern/cycles/render/nodes.cpp
# intern/cycles/render/osl.cpp

Cycles: Fixed broken displacement

Cycles: Fixed broken bump mapping

Cycles: improved texture differentials for bump maps, added texture differntials to displacement maps