Blender Git Loki

fix python script error

remove debug line from last commit

Sculpt: more brush stuff

* Move more dyntopo settings to brush channels
* Implemented the unprojected radius hack in
the new brush system. I'm not really happy
with it, but doing it properly is going to
take some thought.

Merge branch 'master' into tracking_tools

Geometry Nodes: Only show attribute toggle for field inputs (WIP)

With this patch, the toggle to change an input between an attribute and
a value is not added or displayed for inputs that are fields, as determined
by the socket field status inferrencing.

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

Sculpt: fix clay brush

* BRUSH_MAPPING_INHERIT is now respected
when unset.
* Also added inherit icon to
input mapping curves ui.

Fix bug in last commit

Sculpt: Add a curve brush channel type

* Added a new curve brush channel type
* Added a BKE_brush_curve_strength_ex method
that just takes preset and curve as arguments,
instead of pulling them from Brush.
* Autosmooth and topology rake now have their
own falloff curves.

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/makesrna/RNA_enum_types.h
# source/blender/makesrna/intern/rna_nodetree.c
# source/blender/modifiers/intern/MOD_weld.c
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h

USD IO options improvements

Added default values for the Default Prim Path,
Root Prim Path and Material Prim Path export
options. Now validating that these options are
set to well formed USD paths and raising an
error if these paths are invalid. This helps avoid
potential crashes when attempting to define
USD prims with invalid paths. Also updated import
shaders option menu tooltip.

Cleanup: Replace iterator class, general cleanup

Instead of the iterator class which requires a bunch of boilerplate
code, use a callback based iterator. Also removed a overly pedantic
assert and wrong friend declarations.

Cleanup: Sync minor change with master

Cleanup: Remove extra white space in DNA_gpencil_modifier_defaults.h

Remove .orig file from merge conflict

Fix broken catalog adding logic

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

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

Asset Catalogs: return success from AssetCatalogService::write_to_disk

Not used yet, but it could be :)

Cleanup: asset catalogs, explicitly name parameters

No functional changes.

Fileops: call `BLI_path_slash_native()` in `BLI_dir_create_recursive()`

Make the Windows version of `BLI_dir_create_recursive()` call
`BLI_path_slash_native()` before it tries to handle the path. This
should make it possible to call it with non-native path separators.

Still under review in D12611.