Blender Git Loki

Fix conflicts in space_sequencer.c

Merge branch 'master' into asset-greasepencil

Merge branch 'master' into soc-2021-vse-strip-thumbnails

Revert "Remove static variable usage. Increase extra images cached"

This reverts commit 72550b8dc7b46d0d0ed7d3651eba8ae8f4c0c710.

fix

support fields in point translate node

fix noise node

automatically change type in attribute node when selecting attribute

support passing attribute field from modifier

Asset Catalogs: first implementation of loading a catalog definition file

Asset Catalogs: rudimentary writing catalog definition files to disk

`AssetCatalogDefinitionFile::write_to_disk()` can be used to write asset
catalog definition files to a text file on disk. It is very rudamentary,
and should be improved by sorting the written catalogs.

support modifier inputs again

Fix missing pre-filtering execute in the OIDN Cycles X

The `execute()` call got missed in some cleanup of the initial hacky
implementation and indicatives of it did not get proper attention.

The pre-filter takes about 0.5sec per pass on i9-11900k Full-HD image
which indeed makes it not suitable for the preview render.

The file used to verify this change: F10247300

Result:
|No filter|With filter|
|{F10247303}|{F10247304}|

cleanup

cleanup

Merge branch 'master' into temp-geometry-nodes-fields-prototype

Cycles X: Support OIDN with guiding pass prefiltering

Straightforward implementation based on example from the OIDN 1.4
release page. Always configure the beauty pass denoising with the
`cleanAux true`, so that when guiding passes are noise-free we
don't filter them and don't introduce possible artifacts. When the
pre-filtering is enabled, then on top of cleanAux option we will
filter the guiding passes.

Has a separate option for viewport and final rendering, as pre-filter
is not coming for free and for viewport we want to be as interactive
as possible by default. From quick tests it seems that pre-filter is
rather quick, so maybe it can be enabled for viewport as well.

The final render has the option enabled by default to help with cases
when the result is tricky and noisy. If the passes are known to be
noise free is better to disable filtering manually. Can re-iterate
over the default value after gaining some more statistics.

Test file: F10242785
Ground truth: {F10242777}

|Samples|NLM|OIDN Old|OIDN new no filter|OIDN new with filter|
|64|{F10245231}|{F10245242}|{F10245244}|{F10245243}|
|256|{F10245232}|{F10245248}|{F10245233}|{F10245249}|

Extra result with the `pvt_flat.blend` scene:
|Samples|NLM|OIDN Old|OIDN new no filter|OIDN new with filter|
|256|{F10245234}|{F10245237}|{F10245235}|{F10245236}|
|512|{F10245238}|{F10245241}|{F10245239}|{F10245240}|

NOTE: NLM is done in the master branch, where lighting is handled a bit
different. Hence the difference in the light condition.

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

Merge branch 'master' into cycles-x

Removing links when disabling socket is not necessary.

LineArt: obindex lookup for matching shadow edges.