Blender Git Loki

USD material import initial implementation.

Fix T81969 VSE: Wrong UI colorspace after scene strip update

This regression was caused by rB57de5686048f which disabled srgb
transform after the python callback.

The right thing to do is to only rebind the framebuffer once to
reset the no-srgb override.

LineArt: Discard outside lines

LineArt: Use separate adjacent info for clipping

Fix T81942 EEVEE: Reflection Plane glitch with low clip distances

This was happening because the raytrace was not even being performed
due to the tracing line being too small after frustum clipping.

Fix T73793 Walk navigation crosshair gets hidden behind objects

This was reintroduced by the wide line emulation workaround.

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

LineArt: type compatible with MSVC

Cleanup: Use DNA deprecated guards around old flags

These flags shouldn't be used except in versioning code.

Merge branch 'blender-v2.91-release'

Fix T81818: Outliner mode column crashes with shared object data

For objects with shared data, it makes sense to show the mode icon for
every object sharing the same data if one of them is in edit mode.

This also disables the "extend" functionality in this case, because
being in edit mode for multiple objects with the same data isn't
supported.

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

Merge branch 'blender-v2.91-release'

Pydoc: Fix sphinx compile warnings about freestyle

Sphinx expects functions and methods with the same name and different
parameters to be written using one directive. See:
https://www.sphinx-doc.org/en/master/usage/restructuredtext/domains.html#basic-markup

Unfortunately this makes giving different descriptions for each harder.
This was already a request for better support for this in sphinx, see:
https://github.com/sphinx-doc/sphinx/issues/7787

Reviewed By: campbellbarton

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

Cleanup: make format

Fix Unreported: Missing box mask in sculpt

There was a weird bug in the API where a value of 0 gave a mask value of
1. I am not sure why this is but the current code works as desirable.

This was missed in rB6faa765af8954948de3cec75a2261a5aa139b4e5

Merge branch 'blender-v2.91-release'

Fix Unreported: Missing box mask in sculpt

There was a weird bug in the API where a value of 0 gave a mask value of
1. I am not sure why this is but the current code works as desirable.

This was missed in rB6faa765af8954948de3cec75a2261a5aa139b4e5

Merge branch 'blender-v2.91-release'

Cleanup: Simplify outliner mode column drawing function

Move the checks for whether to draw the button to the beginning of the
function and return early. Also use a shorthand variable for ob_active.

Committing to 2.91 as a patch for an upcoming bug fix depends on these
changes.

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

Geometry Nodes: Add edge split node functionality