Blender Git Loki

Merge branch 'master' into alembic_basic_io

Curves: fix corrupted displist.

See comment in the code for explanation.

install_deps.sh: fix building of Alembic 1.6.0 on Linux.

Differential Revision: D2091

Merge branch 'master' into soc-2016-multiview

Make new depsgraph aware of CacheFiles.

This adds a new component type in the depsgraph for cache file
evaluation. The cache file itself is not evaluated, rather it is for
evaluating objects depending on the cache file (through modifiers and
such).

Cycles: Once again fix MSVC building

Apparently, MSVC doesn't like enum values being larger than 32 bit.
So, for now the enum entries are just #define'd instead.

Merge branch 'master' into alembic_basic_io

Conflicts:
source/blender/blenkernel/intern/anim_sys.c

update "bound" flag of GPU strand shaders

Not sure how useful it is to track this. Just making it consistent.

"bound" only stays in sync with GL if we are careful to use the
GPU_strand_shader_bind/unbind functions. Rogue calls to GPU_shader_bind
update GL's state without updating strand shader's "bound" flag.

merged master

initialize variables before use

Now builds with MSVC 2015 (was treating warning as error).

Strand root returned from this function is safer: NULL when len <= 0.

Subdivision for strand fibers.

This is not supported for the edit mode fibers yet. Unifying the buffer creation
here would help a great deal.

Cycles: Add additional debugging output containing the estimated rMSE reduction per sample

Cycles: Fix 2-parameter least-squares helper function

Cycles: Fix artifacts in lower-left tile when denoising on the CPU

WIP: Packing computation

More functionality and hooking up of functions
Contains even more debug prints and commented code

Merge branch 'master' into asset-engine

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

Comment.

Try to sample VDB volumes through the attribute node.

Fix compile error.

Merge branch 'openvdb' into cvdb_ray_isect