Blender Git Loki

Modifier: warn if the ocean simulation fails to allocate memory

While most modifies don't handle out of memory cases, ocean simulation
could attempt huge allocations: 2048 gb at the maximum resolution.

Resolves T83952.

Cleanup: use C comments for descriptive text

T90371: Asset: Drop Material Tooltip.

This patch changes the drop named material tooltip to give feedback to
the user what is going to happen when they invoke the change.

There are 3 states:
* "": Operator will be canceled as not all data is present (dropping on
background.)
* "Drop <named material> on <object name> (slot <slot number>, replacing
<current material in slot>).
* "Drop <named material> on <object name> (slot <slot number).

Reviewed By: Severin

Maniphest Tasks: T90371

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

Cleanup: add comment to fix for T90417

Geometry Nodes: Curve Set Spline Type

This node sets the selected (or all) splines in curve to a chosen target
spline type. Poly, Bezier, and NURB splines can be converted to any of
the other types. This is meant to be a building block node, useful in
many procedural situations.

In the future the node could be optimized with multi-threading, or by
avoiding copying in many cases, either by retrieving the curve for write
access or by passing the raw vectors to the new splines where possible.

With edits from Hans Goudey (@HooglyBoogly)

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

Fix T90417: font loading creates duplicate ID names

Also repair any errors in existing files.

Error from e0dd3fe5872ba37ff188e292b80b46fcf8df413c.

Cleanup: de-duplicate ID renaming utility for versioning

Icons: add license headers to utilities

Icons: update alert icon script

Missed from c549d736cff0d5013f05fb5240ef07671c5aa5ce.

Icons: resolve various issues for generating icons

- INKSCAPE_BIN environment variable was ignored by
alert_icons_update & prvicons_update.
- `make icons` wasn't regenerating alert icons.
- Updating SVG icons failed using blender built with ASAN.

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-solidify

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/geometry/intern/solidify_nonmanifold.c
# source/blender/nodes/NOD_static_types.h

Merge remote-tracking branch 'origin/soc-2021-porting-modifiers-to-nodes-extrude' into soc-2021-porting-modifiers-to-nodes-extrude

Merged Master

adaptive_cloth: Mesh: edge flippable: no connecting edge ov1, ov2

Ensure that the edge when flipped does not already have a connecting
edge. This leads to a variety of problems like overlapping duplicate
faces or deletion of faces if no duplication is a requirement. Edge
flips should only change the orientation of the edge which is only
through connectivity change, not actually change the number of
edges/faces.

adaptive_cloth: AdaptiveMesh: flip edges: set edge size

It is important to set the edge size for all the newly created edges.

Limit the number of loops, it can easily become an infinite
loop. There should be a better solution for this but cannot think of
one as of right now.

Always check if the edge is still flippable or not. Again, this
couldn't be solved with a different flip edge algorithm where the new
edge is always added, but right now, that isn't possible.

Implement second boolean operand resampling, cleanup

Add volume grid "to_static_type" utility

Merge branch 'master' into geometry-nodes-level-set-nodes

enable EGL on buildbot for testing

Support switching between two fields in the switch node