Blender Git Loki

Merge branch 'master' into greasepencil-object

LANPR: Don't use background intersection calculation for GPU mode.

Undo: Initial wip useless to handle ID pointers issues through more mappings.

Don't think this is a working solution in fact, for at least two
reasons:
* Chaining Undo and Redo steps in random paterns with some ID being
reused and others being new all the time would require a very complex
system to keep track of all those changes and keep being able to remap
properly pointers from unread datablocks the the right new memory of
read datablocks.
* As small as it is, there is a risk of pointer collision here, and I
cannot see how to 100% handle it safely and sanely.

Overlay Engine: Add SMAA to replace FXAA

This gets rid of the TAA which needs to be added back

USD: Allow running unit tests without 'make install' step

When the PXR_PLUGINPATH_NAME environment variable is defined, the USD
library uses it to find its JSON files. This allows the unit tests to
run without having to 'make install' Blender.

USD: Fixed include path for unit tests, now TBB headers can be found

Color transforms were fixed in Windows MR -> disable our workaround

USD: fixed paths in usd.diff

I made the previous diff with `git diff` in the USD source, which produced
paths incompatible with the patch command we use to apply it.

Merge branch 'master' into greasepencil-object

USD: Check location of USD JSON files in unit tests

This commit adds a test to see whether the USD JSON files can be found
and loaded. Simply the ability to create a USD Stage for a specific
filename means that the extension has been recognised by the USD
library, and that a USD plugin has been loaded to write such files.

USD has been patched to not only look in `{exe_directory}/lib/usd`, but
also in `{exe_directory}/../lib/usd`; the latter is required to resolve
the path for test executables in `bin/tests/`.

Cleanup: USD: remove unused header files

Undo: Re-use existing IDs from old bmain: do not search by name.

This is actually a fairly bad idea, since IDs can be renamed...

Only search by pointer value now, this *should* work in all expected
cases once undo/redo fully reuses unchanged data-blocks.

Undo: save/restore DEG closer to the actual undostep.

Revert "Fully WIP code."

This reverts commit d726305d98db6ccfb1f3b4cd9b7b75540e606faa.

Need better cleaner changes here.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into undo-experiments

GPencil: Implement Vertex Overlay and set Vertex as default

Now in Material Overlay mode the Vertex Color is not used and by default the 2D template uses Vertex Mode

GPencil: Make Vertex Color works in Vertex Mode

WIP: Need to disable Vertex Color in Material mode

GPencil: Resorder List icons to be consistent

Now the icons are in the same order in Dopesheet, Layers and Material list

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/versioning_280.c