Blender Git Loki

Merge remote-tracking branch 'origin/master' into temp-sybren-usd-patch

use array instead of map

Fix Wireframe issue with infront objects

We were testing against the stencil buffer but the actual stencil was not
the one expected. But with current implementation it is not even required
so we just bypass it.

deduplicate node creation

Merge branch 'asset-uuid' into asset-engine

Merge branch 'master' into asset-uuid

Fix infront selectability of solid objects

initialize ids of xnodes

free memory of inlined node tree

Fix In Front object selectability

We use the same trick as before but we now isolate it to a drawmanager
state to avoid loosing track of the state.

USD: clarification of USDAbstractWriter::is_supported()

USD: iterate() ? iterate_and_write()

USD: 1024 ? FILE_MAX

Merge branch 'master' into greasepencil-object

USD: avoid term 'original' in non-CoW context

Instead of 'original object' the code now mentions 'source' or
'duplisource'.

USD: renamed `prune_the_weak` ? `remove_weak_subtrees` + arguments

USD: rename `link` to `dupli_object` and made variable loop-local

I added an explicit `!= nullptr` to make the formatter put the three parts
of the `for`-statement on three different lines (instead of two), which
increases readability.

USD: made `bool weak_export` `const`

USD: removed terminal colour codes

USD: add unit test to test `HierarchyContext::operator<()`