Blender Git Loki

Cycles kernel split : Refactor: replace address specifiers with ccl_ macros

__local with ccl_local
__global with ccl_global
__private with ccl_private
inline with ccl_device_inline

Cycles kernel split : avoid explicit macro definition in svm.h

Cycles kenrel split : move use_split_kernel to DeviceInfo class

Cycles kernel split : Move ENQUEUE_SPLIT_KERNEL macro inside path_trace

Cycles kernel split : Use ENQUEUE_SPLIT_KERNEL macro to enqueue split kernels

Add mem_alloc() function for Split kernel buffer allocation

Conflicts:
intern/cycles/device/device_opencl.cpp

Cycles Kernel Split: Cleanup get_node_type_as_string() switch and add todo comment.

Also fix code style in one place.

Cycles kernel split: Disable advanced shading for all split kernels

It was already disabled for AMD split kernel and since the code in advanced
shading is not ready really ported it only causes compilation error.

Merge branch 'master' into cycles_kernel_split

Cycles kernel split: Another attempt to fix error in camera motion

Cycles kernel split: Compilation error fix after recent changes

Not sure what compiler will allow that access to enum values.

Alembic: Quick fixes for strict compiler flags

Move max_render_feasible_tile_size to device_opencl.cpp

Modify split-kernel's path-trace function signature

Use max_render_feasible_tile_size for tile-split determination

Merge branch 'asset-experiments' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py

Some cleanup and addressing TODOs in ID preview generation module.

Expose preview/icon render sizes in bpy.app

Tweak to new and load methods

setdefault would still evaluate the fallback argument,
now avoid calling the real new/load, when the we already have the value loaded

Alembic support for MSurfaceSample customdata.