Blender Git Loki

initial socket draw override

Fix T90364: buttons (partially) behind animchannel search block search

When channels are scrolled to be (partially) behind the search bar,
their widget buttons would still be interactive, preventing the seach
buttons to be usable.

We have to make sure the events are consumed from the search and dont
reach other UI blocks.
We can do so by flagging the block `UI_BLOCK_CLIP_EVENTS` -- but also
have to make sure the bounds are calculated correctly (otherwise the
check relating `UI_BLOCK_CLIP_EVENTS` in `ui_but_find_mouse_over_ex` wont
trigger properly.

Maniphest Tasks: T90364

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

initial array output

Fix T90346: particle force field self effect amount off by one

When calculating the particle step in `get_effector_tot`, we have to
round up (otherwise we might get an extra round in the for-loop in
`BKE_effectors_apply` for certain cases).

Example from the report:
- 10.000 particles, Effector Amount 3
- was rounding the step down to 3333
- going into the for-loop for 0, 3333, 6666 and 9999 (4 times)
- now rounding the step up to 3334
- going into the for-loop for 0, 3334 and 6668 (3 times as desired)

Maniphest Tasks: T90346

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

Merge branch 'master' into soc-2021-vse-strip-thumbnails

Blender Readfile: Fix annoying useless Object reading error messages.

Extend the 'reading error' container to produce the generic short
message in the popup directly visible by the user, and move all detailed
info the `INFO` reports that only show up in the console and Info
editor.

Cleanup: USD importer, consistent naming of function parameter

Rename function parameter `flags` to `read_flag` in the declaration, to
be consistent with the definition.

No functional changes.

initial search when adding expander output

USD: add USD importer

This is an initial implementation of a USD importer.

This work is comprised of Tangent Animation's open source USD importer,
combined with features @makowalski had implemented.

The design is very similar to the approach taken in the Alembic
importer. The core functionality resides in a collection of "reader"
classes, each of which is responsible for converting an instance of a
USD prim to the corresponding Blender Object representation.

The flow of control for the conversion can be followed in the
`import_startjob()` and `import_endjob()` functions in `usd_capi.cc`.
The `USDStageReader` class is responsible for traversing the USD stage
and instantiating the appropriate readers.

Reviewed By: sybren, HooglyBoogly

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

Fix T90341: Crash opening 2.4 file with File Browser editor open

The file selection parameters (e.g. `context.space_data.params`) are
expected to be unset in certain cases. Reading 2.4 files seems to be one
of them. Hence, code using it should check it's set first. Also added an
assert to a File Browser UI template printing a message when the
parameters are unset, to help debugging the issue.

Cleanup: Remove redundant checks in File Browser UI script

Was already checking these preconditions in the poll method.

keep already existing links when adding new sockets

initial support for adding geometry expander outputs

Merge remote-tracking branch 'origin/master' into temp-asset-browser-catalogs

Asset Catalogs: add catalog ID to AssetMetaData

Add field `char AssetMetaData::catalog_id[MAX_NAME]`, to hold the
catalog ID of the asset. This field should be set using the
`BKE_asset_metadata_catalog_id_set()` function, which ensures that there
are no spaces in the ID and that the field is not too long.

For now only used to show in the UI, for development/debugging purposes.

GPencil: Fix problems after merge

The operator was not executed because the general poll for data import was true and always was executed instead of GPencil import operator.

Merge branch 'master' into temp-geometry-nodes-expandable-geometry-socket-prototype

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

Merge branch 'master' into asset-greasepencil

Conflicts:
source/blender/editors/space_view3d/space_view3d.c

Cleanup: deduplicate type conversion logic