Blender Git Loki

Fix buttons for string properties not drawn nicely in top-bar

Cleanup include files

Fix merge error

VS2017 crash in the midle of the merge process and created wrong git tag lines

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/draw/intern/draw_cache_impl.h

Fix: Crash when moving GP frame so that it replaces the one before it

This crash only occurred in a particular file, when onion skinning was
enabled. For some reason, the fact that this function was clearing the
layer's actframe (when the frame being deleted wasn't currently active)
was causing problems. I'm guessing that the GP draw engine code currently
assumes that gpl->actframe will always be set/valid?

Correct pointer use

Fix incorrect is_read arg passed to opj_stream_create_from_file

Operator for generating hair follicles of the fur modifier.

Fix mesh sample inner loop for poisson disk generator, returned false always.

Upgrade to openjpeg 2.3

fix for infinite recursion with cluster percentage activation

also remove kinematic state of stopped shards (if object is triggered and not kinematic) at start frame now

Merge branch 'blender2.8' into greasepencil-object

Hide override timing stuff behind some debug define.

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'id_override_static' into asset-engine

Fix crashes when loading old GP files from 2.79

Moved all the datablock-twiddling version patching magic to the
"after_liblink" version patching function. Apparently the problem
was that many of the old pointers had not been fixed up at that point,
causing problems if relying on accessing their contents.

Merge branch 'blender2.8' into id_override_static

Some cleanup/renaming, and move 'self remapping' into new id_swap function.

I can't think of any case where we would swap content of two IDs while
wanting to keep old 'self' ID pointers after the swap!

Rename destination and source parameters in override_apply.

local and reference are awfully confusing names here, since destination
is a copy of reference that will become local override once applied, and
source is .blend-file-written version of local override...

Follicle generation function for hair systems.