Blender Git Loki

Merge branch 'master' into cycles_kernel_split

Conflicts:
intern/cycles/kernel/svm/svm.h

Cycles kernel split: Move address space specification to DebugData typedef

Debug pass does not really work, but it isn't caused by this change and would
need to have separate look.

Cycles kernel split: Move address space specification to PathRadiance typedef

Cycles kernel split: Move address space specification to Intersection typedef

Cycles kernel split: Move address space specification to ShaderClosure typedef

Strands edit data conversion wants the raw shape key number (starting
at 1), converts to index internally.

Cycles kernel split: Move address space specification to ShaderData typedef

Same as previous change, reduces amount of technical changes related to adding
ccl_addr_space all over the place in the kernel.

Merge branch 'master' into cycles_kernel_split

Cycles kernel split: Move address space specification to KernelGlobals typedef

This way we don't need to add ccl_addr_space specification all over the kernel
for KernelGlobals.

Gooseberry: Attempt to fix compilation error with scons

Preview API: be more strict with new/load

Don't silently reuse existing id's, instead make dev use typical dictionary API calls if they're not sure the item
already exists.

Also add reload method.

Cycles kernel split : Disable TRANSPARENT_SHADOWS for AMD platform

AMD platform has some known issues with TRANSPARENT_SHADOWS feature.
Disabling TRANSPARENT_SHADOWS until AMD drivers overcome the issues.

Revert "Squashed commit of asset-experiments branch."

This reverts commit aaf87e2c521d03a0329b0c27859556e37fe2c489.

Squashed commit of asset-experiments branch.

Get rid of nice 'static' in array args of functions, MSVC does not like them. :(

Cycles kernel split : Remove SPLIT_KERNEL suffix in device_opencl.cpp

Cycles kernel split : Remove misleading load_kernels progress bar status

Fix for own error in merging alembic branch, breaking shape keys.

Both the gooseberry and alembic branches contain extensions of the Key
DNA structure, in order to make it work for particles and caches
respectively. This was giving badly resolved conflicts on merge.

Merge branch 'master' into alembic

Merge branch 'master' into gooseberry