Blender Git Loki

Merge branch 'master' into cycles-x

show domain dropdown in socket

Basoc Curve Fillet node implementation

Basic Curve Fillet node implementation

Merge branch 'soc-2021-curve-fillet' of git.blender.org:blender into soc-2021-curve-fillet

Fixed issue with incorrect radius for fillet

Radius can now accept builtin attributes as well

Cleanup: Refactored fillet code

Added support for multiple resolution curve fillet segments

Added curve fillet support for Poly Splines

Fixed error with accessing empty optional variable

Merge branch 'master' into soc-2021-curve-fillet

Fixed two warnings on curve fillet code

Merge branch 'master' into soc-2021-curve-fillet

Cleanup: Commenting and minor refactoring

Specified function arguments as const

Curve fillet support for non-vector handles

Cleanup: Comment formatting fix

Merge branch 'master' into soc-2021-curve-fillet

Added curve fillet support for NURBS curves (temp)

Cleanup: Renoved redundant spline type check.

Merge branch 'master' into soc-2021-curve-fillet

Added option to avoid overlap of curve fillet

Merge branch 'master' into soc-2021-curve-fillet

Improved limit radius algorithm in curve fillet

Improved limit radius behavior in curve fillet

Merge branch 'master' into soc-2021-curve-fillet

Merge branch 'master' into soc-2021-curve-fillet

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

LineArt: UI range optimizations.

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

Knife: Added new knife modal keymaps to industry compatible

Merge branch 'master' into soc-2021-curve-fillet

Merge branch 'master' into soc-2021-curve-fillet

fix passing values from modifier

initial socket draw override

initial array output

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

initial search when adding expander output

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