Blender Git Loki

Merge branch 'master' into cycles_kernel_split

Cycles kernel split : Fix object_dir_transform -> object_normal_transform

Merge branch 'master' into cycles_kernel_split

Conflicts:
intern/cycles/device/device.h
intern/cycles/kernel/kernel_types.h

Cycles kernel split: Cleanup some style and unused header

Cycles kernel split: Enable some features for split intel and nvidia kernels

There still some differences between split kernel and megakernel and this is
to be investigated further.

Fix type

fix kernel names some more

move to ccl_fetch for kernel_path.h

Cycles kernel split: Move requested tile size from render tile to device task

It is semantically more correct since it's used for only device-specific
calculations.

Cycles kernel split: Make sure task pool is cancelled in device destructor

Also reverted whitespace change compared to master.

Cycles kernel split: De-duplicte device task logic

Move it to the base class and make thread-run virtual function.
This way we don't need to keep task-related logic in all the
derived classes.

Cycles kernel split: Get rid of tile-split related logic in RenderTile

It's only used by OpenCL device and needs to be done in some more generic way,
likely involving Blender querying the maximum/best render settings from the
render engine.

Cycles kernel split: Make device_opencl even closer to master

Cycles kernel split: Style cleanup in new classes from device_opencl

Cycles kernel split: Finish kernel files rename

use ccl_fetch in kernel_path_surdace

Rename opencl entry points

Formatting fix

replace sc_fetch with ccl_fetch_array

Merge branch 'master' into cycles_kernel_split