Blender Git Loki

Merge branch 'master' into blender2.8

BLI_utildefines: sync w/ 2.8

Cleanup: use 'uint'

Cycles: Fix after recent merge from master

random_id() crashes when there is no current dupli object.

We could also throw a Python error when doing it via RNA, but as far as
Cycles is concerned we need to check if instanced.

GSet: utils to access data stored outside the set

Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenlib/intern/rand.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/makesrna/intern/rna_mask.c

Merge commit '212a8d9e5ae7' into blender2.8

Considerable non-trivial merge conflict fixes.

Merge commit '212a8d9e5ae7^' into blender2.8

Fix T53309: Remove default 'Clear loc/rot/scale delta transform' shortcuts.

The loc one (shift-alt-G) was same as 'remove selected from active group'
action... Clear delta transform is not a common operation, so we can
live without a default shortcut for it.

Note that using same key (G) in same space for two completely different
kind of operations is probably a rather bad thing, nice topic for future
keymap work. ;)

Probably nice to have in 2.79a.

Cleanup: order from a-z structs in BKE_collection.h and BKE_layer.h

Eevee: SSS: Fix SSS with Add Shader node.

Eevee: Add SSS objects to probe rendering.

This does NOT do the SSS diffusion when rendering probe but at least you can see your object without SSS in reflections / bounce light.

Fix Opengl Error with glBlitFramebuffer

This was caused by 93936b8643b9c4f77fe13d35b41ecaa246843dd8

From GL spec :
GL_INVALID_OPERATION is generated if mask contains GL_DEPTH_BUFFER_BIT or GL_STENCIL_BUFFER_BIT and the source and destination depth and stencil formats do not match.

So blitting framebuffer with depth or stencil require the SAME FORMAT.

Smoke: Pass non-trivial arguments by const reference

Fix compilation error with clang-5

Alembic: Fix mismatch in forward declaration with definition

Fix missing SpinLock typedef on macOS

Add stdlib include for utildefines

Ideally we could just declare abort, but this has attributes
based on the platform, so include stdlib instead.

Fix T53068: AMD Threadripper not working well with Blender

The issue was caused by SpinLock implementation in old pthreads we ar eusing on
Windows. Using newer one (2.10-rc) demonstrates same exact behavior. But likely
using own atomics and memory barrier based implementation solves the issue.

A bit annoying that we need to change such a core part of Blender just to make
specific CPU happy, but it's better to have artists happy on all computers.

There is no expected downsides of this change, but it is so called "works for
me" category. Let's see how it all goes.

Cleanup: order BLI before BKE headers

This was done nearly everywhere already