Blender Git Loki

Merge branch 'master' into temp_bmesh_multires

Merge branch 'blender-v2.93-release'

LibOverride: Tag base's object pointer as not overridable.

LibOverride: More fixes to properly ignore non-overridable ID pointers.

GPencil: Check if original Object has materials to append

GPencil: Simplify Poll function

Merge branch 'blender-v2.93-release'

Fix kernel loading time accounted twice in render progress

The render session is keeping track of the scene update, which includes
kernel loading time.

This fixes negative render times reported when CUDA kernels are compiled
at runtime.

A bit fragile logic, can be re-implemented using some user-counted
scope utility classes, so that only outer-most time skip is applied.

GPencil: Implement Merge by Distance for curves

This commit adds the `BKE_gpencil_editcurve_merge_distance` function.
It will merge the control points by distance (always at the first point).

Merge branch 'blender-v2.93-release'

Cycles X: tune kernel parameters for RTX cards

As the kernel keeps changing the optimal values will change as well, so this
will need to be revisited when more work is done. And every kernel probably
has a different optimal value. But this is an easy step in the right direction.

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

Fix Cycles X crash using a BSDF in a light shader

* Move BSDF feature test so the right offset is applied
* Exclude BSDFs from volume shaders, and volumes from surface shaders,
to prevent a similar issues.

It would be most efficient to exclude BSDFs entirely from light shaders, but
this is difficult since Cycles does not make a distinction. A shader can be used
by both a Mesh and Light and is compiled only once. We do make a distinction
between surface/volume/displacement shaders, so for that case we can ignore
the node during shader compilation.

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

Merge branch 'master' into temp-gpencil-bezier-stroke-type

LibOverride/LibQuery: Refactor 'non-overridable' status management.

Move the detection/decision of whether an ID pointer should be taken
into account in library override hierarchy processing to the LibQuery
area of code, by introducing a new callback flag.

This allows to factorize the test logic, be explicit in liboverride code
about ID relationships that can be ignored when exploring the override
hierarchy, and adds the possibility to do more checks about pointers to
be tagged as non-overridable in the future.

Note that all but the 'special' ID pointers (loop-back, embedded, etc.)
should be overridable. If some is not, relevant IDType 'foreach_id'
callback code is reponsible to tag it properly.

Python-defined IDProperties however are not systematicaly overridable
(yet), so this should allow us to detect that case and act accordingly
in an incomming commit.

No behavioral change expected in this commit.

LibOverride: Fix usage of IDProps that are not overridable.

Not all python-defined ID properties are overridable (yet), this needs
to be detected by libquery 'foreach id' code, such that those ID
pointers can be ignored by override code when working on override
hierarchies.

Fixes part of the issues found while investigating studio files (namely,
some py-defined ID pointer properties from rigify that are not currently
overridable would cause issues and false detections during resync).

LibQuery: Cleanup: Document more fields of `LibraryForeachIDData` struct.

Merge branch 'blender-v2.93-release'

Cleanup: clang format

Missing from rB04905c56523a, sorry for the noise.

Fix kernel loading time accounted twice in render progress

The render session is keeping track of the scene update, which includes
kernel loading time.

This fixes negative render times reported when CUDA kernels are compiled
at runtime.

A bit fragile logic, can be re-implemented using some user-counted
scope utility classes, so that only outer-most time skip is applied.

Cycles: Report device compute type to the full log

Makes it more explicitly visible whether rendering was done on CUDA
or OptiX.

Before this change one had to carefully look at the device ID, and the
look of OptiX device IDs was a bit confusing (mentioning both CUDA and
OPTIX in the ID).