Blender Git Loki

Merge branch 'id_override_static' into asset-engine

Fix T52490: NDOF orbit doesn't lock in ortho view

Regression in af3f7db caused by own fix for T51324

Disable onion skinning in edit modes

Merge branch 'master' into id_override_static

Fix bplayer (c)

Fix T52396: Crash loading template w/o config dir

Fix merge error

Merge branch 'blender2.8' into greasepencil-object

Reorganize Onion drawing and hide on Play

Hide on play the onion skinning and refactor drawing functions for onion skining

Cycles: Add maximum depth stat to bvh builder

Fix implementation of atomic update max and move to a central location

While unlikely to have had any serious effects because of limited use, the
previous implementation was not actually atomic due to a data race and
incorrectly coded CAS loop. We also had duplicates of this code in a few
places, it's now been moved to a single location with all other atomic
operations.

Fix T51805: Overlapping volumes renders incorrect on AMD GPU

We need to make sure we can store all volume closures for all objects in volume
stack. This is a bit tricky to detect what would be the "nestness" level of
volumes so for now use maximum possible stack depth. Might cause some slowdown,
but better to give reliable render output than to fail quickly.

Should be safe for 2.79 after extra eyes.

Merge branch 'master' into blender2.8

Cleanup: move variadic defines to their own header

So we can use in headers without pulling in many other defines.

Cleanup: mark VA_NARGS_COUNT as public

Was already used in two other headers, remove underscore prefix.

Fix T52218: Missing update when reconnecting node

If node was connected to output, we tag tree for update no matter where
the node was re-plugged to.

Should be safe for 2.79.

RNA: use string join functions as with operators

Merge branch 'master' into blender2.8

RNA: use string-join to simplify operator register

Also sanity check macro-operator ID's.

BLI_string_utils: string joining utility functions

Includes a version that takes a separator and macros for convenience.