Blender Git Loki

install_deps: Update llvm to 12.0 (with minimal now being 11.0).

Ref T88438.

install_deps: Update OIIO to 1.1.15.1.

Ref. T88438.

Cleanup: OSL buildlib patch: Remove `.rej` part.

This patch contained changes for an `.rej` rejection file generated by
failed patch apply... Definitly nothing to do here.

install_deps: Update OSL to 1.11.14.1.

This has been a huge pain to get working, for several reasons (new flags
needed, patching is now mandatory, etc.).

Further more, discovered that debian OIIO package is now silently
relying on OpenCV, without even proper handling of this dependency (at
least in the `-dev` package), so had to revert to force-build own OIIO
again on that distro for the time being.

Ref. T88438.

Cycles X: restore CPU sampling profiler

Stats now reflect the new kernels. Also change implementation to unset active
shader and object, previously there were some hard to verify assumptions about
for which kernels we can assume they are correctly set.

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

Fix 'BLI_task_parallel_mempool' keeping 'user_chunk' unchanged

When `BLI_task_parallel_mempool` does not use threading, the
`userdata_chunk` is allocated locally simulating a TLS.

However `func_reduce` is not called so the original chunk is ignored.

`task_parallel_iterator_no_threads` is another function that doesn't call
`func_reduce`. It also ignores `userdata_chunk_local` in the main iterator.

The solution in these cases is not to create a `userdata_chunk_local`.

This fixes T90131

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

USD export: improve stage creation error message

When stage creation fails, now notifying user if the
export path is already open in a USD layer,
possibly because the USD is being referenced by
modifiers and can't be overwritten.

Fix count attribute pass through to lower level functions.

deps: Reduce llvm/clang footprint for windows

We shipped the whole bin folder for llvm/clang
while we only needed clang-format, by shipping
just the bits we need we save about 700 megabytes
off our svn lib download.

Fixes for pass handling in Cycles X

- Register Shadow Catcher pass as 3-component RGB color.
Matches the way how it is stored, solving uninitialized alpha channel.

- Don't write alpha channel in denoiser when the denoising input is a
3-component color pass.

- Add safety asserts in the film conversion kernels.

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

Cycles X: fix/improve handling of mismatches between render pass components

Rules are as follows now:
* Single channel pass: can be read into buffer with 1, 3 or 4 channels
* Motion and cryptomatte passes: must be read into buffer with 4 channels
* RGB, RGBA and vector passes: can be read into buffer with 3 or 4 channels

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

Merge branch 'master' into asset-greasepencil

Conflicts:
source/blender/editors/render/render_preview.c

Data-block Preview: Create preview using current frame

The preview was always using frame 1, but maybe the object has changed and it's better create preview using the current frame.

Reviewed By: Severin

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

Compositor: Full frame Set Alpha node

Adds full frame implementation to this node operations.
No functional changes.

Merge branch 'master' into cycles-x

Cleanup: Remove debug-only code

Merge branch 'master' into cycles-x

Fix building without Cycles logging

Ideally can use assert() checks instead of suppressing the check entirely,
but for now just fix compilation error quickly.

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

Compositor: Full frame Color Ramp node

Adds full frame implementation to this node operation.
No functional changes.