Blender Git Loki

Cycles: Replace use of cl_mem with device_memory in split kernel device

Working towards using only device agnostic types and methods in the host.

better inflow map generation

Fix Blenderplayer not compiling....

Merge branch 'master' into cycles_split_kernel

Cycles: Refactor so all split kernels have same signature

This is to set things up for supporting the split kernel on cpu and other
devices. By having the same signature for each kernel we can deduplicate
a lot of code without needing any trickery. The only kernel that doesn't
share this signature is the `data_init` kernel, which might end up being
different for each device type.

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/manipulators/WM_manipulator_api.h
source/blender/windowmanager/manipulators/WM_manipulator_types.h
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c

Merge branch 'blender2.8' into layer-manager

Merge branch 'master' into asset-engine

Cycles: Simplify shared buffer and argument passing in split kernel

Adds a single buffer for storing and passing around data shared between kernels.
The idea is to have there be less code so things are easier to work with and
later deduplicate.

Benefits:
- reduces the number of buffers that need to be allocated and kept track of by
using a single buffer for data shared between kernels
- simplify passing of arguments to kernels by using a pointer in kernel
globals to point to shared data
- simplify calculation of shared data size

Things may need renaming / reorganizing but this is just to get things started.

Merge branch 'master' into temp-sybren-poselib

Explicitly switch to camera from either pose or scene marker.

Fix

Don't draw meaningless dot-icon for layers

dynamic fracture, divide force by mass to get higher probability of secondary fractures

added dynamic minimum shard size as option

dynamic fracture, fix for passive shards... dynamic cache was not used at all for it

Merge branch 'master' into temp-sybren-poselib

Use new base iterator in new viewport

Apply soc-2016-layer_manager as patch onto blender2.8

Creates a new branch layer-manager (based on blender2.8), old one will be removed (but will stay available at https://github.com/julianeisel/blender.git). Had lots of conflicts, lets hope nothing got lost :)

Support displaying layer list in outliner

Adds a new outliner display mode "Layers" in which the basic layer tree is drawn. The button for restricting layer visibility is also already there.