Blender Git Loki

Merge branch 'master' into tracking_tools

Merge branch 'master' into asset-greasepencil

GPencil: Remove unused flag

This flag was used in older versions, but now is not used anymore.

Nodes: Revert some socket declarations to previos API

See T91826, there is a bug in the code where both `.` and `_` are used as a seperator for `BLI_uniquename_cb`.

This resulted in some nodes becoming disconnected on file load.
Until this is resolved, the chnages are reverted to prevent data loss.

Merge branch 'master' into temp-ui-tweaks

Assets: Support dragging assets on "Unassigned" catalog

Dragging assets onto the "Unassigned" catalog tree item will effectively
move the assets out of any catalog. Technically this means unsetting the
Catalog-ID stored in the asset metadata, or more precisely setting the
UUID to be all zeros.

Cleanup: Separate interface & implementation for asset catalog tree-view

Should make the code a bit more organized and help getting an overview
of the interfaces more quickly.

Cleanup: Use static function for asset catalog tree-view helper

Fix T91823: Regression not showing idblocks when recursion is set to `Blend file`

Introduced by fc7beac8d6f4. During code review it wasn't clear why this
branch was needed, so we removed it. Now it is clear why it is needed
so we added it back and added a comment why the branch is needed.

Patch provided by @Severin.

Fix T91861: Black environment behind shadow catcher

Always sample background pass behind shadow catcher (if the pass
exists, of course), regardless of whether shadow catcher will be
used as approximate or accurate.

Allows to combine accurate shadows into an environment map.

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

Wrapped related global vars into struct.

Move index from DrawEngineType to DRWRegisteredDrawEngine.

Fix T91911: error in image dithering code after recent changes

Thanks to Patrik Olsson for spotting this.

Fix Cycles render time pass being available in UI, but it was removed

This previously only work for CPU rendering, and isn't that practical to get
working in the new architecture.

Fix T90815: wrong Cycles OSL normal map render after recent optimization

Fix T89759: baking normals does not take into account mirror modifier

Fix T91894: Cycles baking normal maps of transformed objects not working

Merge branch 'master' into soc-2021-uv-edge-select-support

Merge branch 'master' into temp-ui-tweaks

# Conflicts:
# source/blender/editors/animation/time_scrub_ui.c

Merge branch 'master' into temp-ui-tweaks

# Conflicts:
# source/blender/editors/animation/time_scrub_ui.c