Blender Git Loki

Merge branch 'master' into node-error-messages-v2

Expand: Support for invert, preserve and mask gradients

WIP changes

Sculpt expand modal keymap

Merge branch 'blender-v2.92-release'

Fix T84645 cursor moves when clicking selector.

The absolute position desktop mapping has been corrected. The correct
mapping is 0-65535 inclusive. Additionally, division by the virtual
desktop width and height needed to be subtracted by 1 as width and
height are one more than the final pixel index.

Cleanup: Remove Unused tracking properties

These properties are unused and serve no purpose.

Reviewed By: sergey, #motion_tracking

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

Merge remote-tracking branch 'origin/blender-v2.92-release'

Fix: Build error with MSVC 2017

BKE_cryptomatte_extract_layer_name was using std::isdigit
without including <cctype> somehow only MSVC 2017 had a
problem with that.

Rename node.c to node.cc

Changes to get node.c to compile in C++

Merge branch 'master' into sculpt-dev

EEVEE: Depth Of Field: Improvement part 2

Add In Focus max CoC tiles to speedup the resolve pass

Cleanup: LibOverride: Update comment.

LibOverride: Also consider regular embedded IDs as virtual overrides.

Those (aka root node trees and master collections) share same 'traits'
as the shapekeys: RNA cannot assign them, so we need to handle them as
sub-data of their owner IDs.

Not sure how much this will help in improving support of overrides for
scenes and nodetrees, but this is a mandatory step towards that goal for
sure.

LibOverride: fix/update/re-enable ID-related debug checks in diffing code.

We should now have the tools to ensure consistency of ID pointers
diffing in `rna_property_override_diff_propptr`.

As a reminder, for most ID pointers we just check the actual pointer value,
but this is not possible for embedded IDs like root node trees or master
collections, and for fake embedded ones like shapekeys, so those should be
handled as mere sub-data of their owner IDs in override context.

Merge branch 'blender-v2.92-release'

Fix T84373: Overrides : shapes keys driven by armature don't work on second instance.

Code generating override operations would not deal properly with Pointer
RNA properties, trying by default to use and check pointers' names
properties like it does with items of a collection.

However, using name property in pointer RNA property case makes no
sense, so specialize the `no_prop_name` flag for each case (pointer or
collection).

here, since second override would generate local data-blocks with
different names than the linked data ones, name matching would fail and
breck handling of override diffing in shapekeys.

Note that shape keys are the only one concerned by that problem, since
other embedded IDs (root node trees and master collections) are fully
real ones, so they always get the same names.

Fix (unreported) copying liboverride of mesh breaks overrides of shape keys.

Our beloved shapekeys are 'virtual' overrides, they need special
snowflake treatment here as well.

They do not have any override data, from override perspective they are
considered as mere sub-data from their owning ID (mesh, lattice, etc.).
Therefore, we should not copy override data from them, but instead
properly flag those new IDs as `LIB_EMBEDDED_DATA_LIB_OVERRIDE`.

Found while investigating T84373.

Fix T84373: Overrides : shapes keys driven by armature don't work on second instance.

Code generating override operations would not deal properly with Pointer
RNA properties, trying by default to use and check pointers' names
properties like it does with items of a collection.

However, using name property in pointer RNA property case makes no
sense, so specialize the `no_prop_name` flag for each case (pointer or
collection).

here, since second override would generate local data-blocks with
different names than the linked data ones, name matching would fail and
breck handling of override diffing in shapekeys.

Note that shape keys are the only one concerned by that problem, since
other embedded IDs (root node trees and master collections) are fully
real ones, so they always get the same names.