Blender Git Loki

Fix build errors on some platforms

Clang format

Cleanup: Simplify Cycles viewport parameters

Use early output and access shading RNA object only once.

Compositor: Use BLI_color in convert alpha node.

Recently the CPP colors module landed in master. This patch will use the
new module in the convert alpha node.

Cleanup: Remove unused argument in Cycles sync

Makes it easier to see where exactly the viewport is used.

Merge branch 'master' into xr-controller-support

Fix T88534: Unable to add a Geometry Node Tree on Volume object

Volumes are supported, poll corrected.

Maniphest Tasks: T88534

Differential Revision: https://developer.blender.org/D11378

Fix T88531: Mantaflow problem with geometry nodes

Objects modified by geometry nodes modifiers were not caught as being
"dynamic".

Now add this modifier type to the list of modifiers making them "dynamic"
in the eyes of mantaflow.

(noticed by @sebbas in chat)

Maniphest Tasks: T88531

Differential Revision: https://developer.blender.org/D11389

Fix T88566: Mantaflow inflow with shapekeys is not working anymore
(regression)

Code was actually checking for shapekeys, but these were not detected
properly (some effects like shape keys are added as virtual modifiers
before the user created modifiers)

Now go over virtual modifiers as well.

Maniphest Tasks: T88566

Differential Revision: https://developer.blender.org/D11388

XR: Enable controller profile extensions

Cleanup GHOST_Xr

XR: Change raycast color

XR: Deactivate draw callbacks on session end

Merge branch 'blender-v2.93-release'

Fix T88251: "Operator Cheat Sheet" Crash

Caused by {rB919558854d62}.

Same fix as in {rBdc8a43c8755a} -- let RNA enum item callbacks check
for NULL context.

The NULL context is used to extract items for document generation.

Maniphest Tasks: T88251

Differential Revision: https://developer.blender.org/D11391

Merge branch 'master' into temp-geometry-nodes-curve-deform-node

EEVEE: Fix ModelMatrix in nodetree and wrong bump map output

EEVEE: Rework multi material handling

Shading groups are now created by the material_array_get functions
instead of passing a reference to be filled later. This avoids having
to wait later to maybe create a sub shading group.
This also simplifies different geomety type handling.

added factor as slot

initially working node