Blender Git Loki

Merge branch 'master' into ui-preview-buttons

Fix SCons compile error (tm)

Merge branch 'master' into UI-experiments

Add variable sliding window for cached filebrowser items.

With big screens and tiny drawing, we can show much more than 1k items at once...
Also allows to reduce number of cached items in case we show few things big!

Apply patch in a new branch, to clean the history a bit

Merge branch 'master' into asset-experiments

Drag type force field for keeping hairs "stuck" to a mesh surface.

improving path handling in py samples for ui-previews

Add safety check in PRV_DEFERRED_DATA

Disallow PRV_DEFERRED_DATA to be used when use_deferred is false

changes for over-allocation

use more conventional `pointer + 1` to access over alloc data.
Was confusing having 2 byte trailing member of struct.

Correct accidental sizeof void*/char mismatch

Merge branch 'master' into cycles_kernel_split

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

Revert "Squashed commit of asset-experiments branch."

This reverts commit 01f7dab9f9309811dce6b5e3a3be7efa57e4a6ac.

Squashed commit of asset-experiments branch.

Merge branch 'master' into experimental-build

Merge branch 'asset-experiments' into asset-engine

Fix bad behavior in case of 'refresh' while still listing.

Mismatch in 'owner' of job, not giving right one to stoping helper, sigh.

Note that this was also affecting any 'interrupting' task (like changing level of flat listing...).

Fix flickering of previews during listing process.

We cannot keep 'stable' list of items during listing process (each time new
entries are added, we have to filter and sort the whole lot again, which
means rebuilding 'draw' data from scratch - previews included).

Just wait until our filelist is complete to generate/use previews.

Fix crash due to some missing final jop update in some rare cases.

Cycles kernel split: Cleanup some style and unused header