Blender Git Loki

Merge branch 'master' into temp-asset-browser-catalogs

Cycles X: keep around scene tile size in DNA for better forward compatibility

We can remove these at some point in the future, but for now it's annoying for
files saved in cycles-x to render with tile size 1x1.

Initial tree structure to load catalogs into

See T90608 and the basic design in T90066.

This tree structure will be needed for adding the UI. It's unclear how
much of the catalog backend will change still. Some design questions
were raised that need further discussion.

Cleanup: rename IntegratorState to IntegratorStateCPU

We already had a IntegratorStateGPU, this way it's more clear that this data
structure is only for the CPU.

Cycles X: fix Python error reading some old files

This property was removed and should not be versioned anymore.

Cycles X: fix broken render when disabling shadows on lights

Fixes T91024

Cycles X: fix missing OSL attributes

Merge branch 'master' into HEAD

new FieldEvaluator utility class

Update buildbot configuration to use `studio-sprite-fright` branches.

adaptive_cloth: fix: Mesh: collapse edge: n2 not updated for v1

A simple solution that is extremely difficult to debug. This
particular part of the collapse edge function is run rarely and to
make this particular bug even harder to find is that only a subsequent
operation will show any signs of a problem.

One way to trigger this bug is to static remesh Suzanne (Blender
monkey) at 0.005 or lower minimum size. This leads to a crash due to a
bad optional access of a node.

The vert refers to the node but the node doesn't refer to the vert. So
once this sort of situation is created, when that vert's nodes need to
be used, it leads to a bad optional access.

Such a simple fix :)

add more flexible field evaluation method

Fix: Memory leak in non primitive collision shape drawing functions

The ojects containing the non primitive collision shape meshes are stored in
a GSet along with other draw cache shapes and the meshes are freed using these
object pointers

Cleanup: Don't use virtual for non-virtual function in Cycles X

Version bump: 2.93.5-rc

Merge branch 'temp-geometry-nodes-fields--fields-jacques' into temp-geometry-nodes-fields

Merge branch 'temp-geometry-nodes-fields--anonymous-attributes' into temp-geometry-nodes-fields

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

add common base class for field input/operation

Make state tracking more reliable in Cycles X scheduler

Move logic to a re-usable function, so that state can be checked for
"regular" and "post-processing" render works.

Also corrected state tracking for tile written flag: it is a "sticky"
flag, meaning once the tile is written is always considered written.
Before this change it was possible that canceling render will write
tile again.

Should be no difference on user level, just preparing ground work for
tiles support.