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: 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.

Icons: update alert icon script

Missed from c549d736cff0d5013f05fb5240ef07671c5aa5ce.

Cleanup: Allow early exit if operator cancelled

Cancel the pack islands operator early, in case there are no UV
selections to pack

Merge branch 'master' into soc-2021-uv-editor-improvements

Merge branch 'master' into soc-2021-uv-editor-improvements

UV: Keymaps for offsetting selected UVs

Adds keymaps to offset selected UVs by a fixed distance in a specified direction.
Refer T78405

UV: Absolute grid snap for UV editor

Adds a UI toggle for absolute grid snap when using Increment snapping in
UV editor. This implementation mimics the behavior observed with the
same toggle in the 3D viewport.

Merge branch 'master' into soc-2021-uv-editor-improvements

Merge branch 'master' into soc-2021-uv-editor-improvements

UV: Increment snapping based on new UV grid types

Since the default UV editor grid has been replaced with a new
subdividing grid and dynamic grid (T78389) has also been implemented,
increment snapping value needs to change according to the grid
configuration in use.

This commit ensures that the increment snapping value is changed
according to the grid dimensions currently in use.
Example - For a NxN grid the increment value is set as 1/N

Cleanup: Refactor reusable code into functions

New functions for :
* Calculating current zoom factor used for determining the grid
resolution in UV/Image editor
* Calculating grid steps for determining the grid spacings in UV/Image
editor

Cleanup: Use struct pointer

Replace struct variables to use pointers instead