Blender Git Loki

Fix Cycles viewport render doing some unnecessary work at the start.

In some cases it would load adaptive kernels or even start rendering
twice because the first time the scene was not fully synced yet.

Update Amber & generic Asset Engine code for changes in 2.8.

Many noisy changes in past 6 months... ;)

Merge branch 'master' into asset-engine

Merge branch 'master' into greasepencil-object

Fix T60300, T57774: Cycles OpenCL viewport crash with subsurface scattering.

Fix T60351: Blender crashes when using fill tool without existent keyframe

Revert/Redo ugly rBd12b3767f81d commit (i.e. add locked sorting option to UIList).

Too many things done wrong in original rBd12b3767f81d to list them all
here, hopefully nothing bad sneaked in again this time :|

Also cleaned up a little the 'sort by name', even though (since we only
have two options by default, sort by index and by name) we can abuse it
as a binary option for now, this is not a bitflag...

Fix T60324: node linking UI bugs with some shader nodes.

Merge branch 'master' into asset-engine

Conflicts:
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_space_types.h

Fix T60244: Bisect in mirror modifier doesn't work properly.

That was indeed not working properly, not at all. Except for
the basic case, but as soon as you used another object to define the
mirror plane, it would be utterly broken, in several different ways!

Merge branch 'blender2.7'

Cycles: Add utility to dump BVH tree as graphviz file

Cycles: Make BVH wider prior to packing

This allows to do more non-trivial tree modifications to make
it more dense and more friendly for vectorization.

Fix T60342: exception when creating cycles integrator or sampling preset

Fix T60338: Allow user to input units of another system

Fix T55336: Crash w/ dyntopo sculpt

Undo System: apply accumulation steps

Apply steps between the active and the undo state being decoded.

Fix sculpt redo failing to enable dyntopo

Fix memfile undo decoding creating undo steps

Exiting modes shouldn't be needed since loading the new memfile
will free the old data.

Sculpt mode dynamic topology was adding undo data on exiting the mode
which isn't logical in this case and can be avoided altogether.

Fix T59165: Text operations fail to undo

Some undo operations encode multiple actions, now all are undone/redone.