Blender Git Loki

Merge branch 'master' into temp-vert-normals-cleanup

Merge branch 'master' into temp-ui-cpp

UI: Fix scaling of HSV cursor when zooming

The small circle used to choose the hue/saturation and value in the
color widget was drawn with a fixed screen space size. Now scale the
circle used as cursor in the color widget based on the zoom. This
could have been part of a9642f8d6130 but the implementation is
different.

Based on a fix provided by Erik Abrahamsson

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

Fix T92268: Group input and output nodes have inconsistent padding

The group output node did not have the same size padding as the group
input, leading to the node looking different and actually being smaller.

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

Cleanup: Rename curve struct fields

These existing names were unhelpful at best, actively confusing at
worst. This patch renames them to be consistent with the terms
used to refer to the values in the UI.
- `width` -> `offset`
- `ext1` -> `extrude`
- `ext2` -> `bevel_radius`

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

Fix: Add tooltip translation marker to disabled hints

This was overlooked, as it seems there's no way for these strings to be
translated currently. Generally it's not that clear whether `N_` or
`TIP_` should be used in this case, but `TIP_` seems more consistent.
To avoid the cost of the translation lookup when the UI text isn't
necessary, we could allow the disabled hint argument to be optional.

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

Fix T84710: Instances with only mesh edges or vertices are invisible

Wire-only meshes have a special case in the overlay drawing to give
the wire shader a special color (which avoids the lines being dashed,
somehow). The fast path for duplis didn't have that special case.

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

UI: Add an option to display the node editor context path

Since we have the overlays popover, it makes sense to allow toggling the
context path like in the 3D viewport. This commit adds a property,
and turns it on by default in existing files.

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

Fix: Updating geometry nodes test results fails

I ran into this when adding new geometry nodes tests.
The issue was caused by 7168a4fa5c785c29483.

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

Merge branch 'blender-v3.0-release'

Fix T93525: Crash with curve/text armature bone gizmo

The problem is that drw_batch_cache_generate_requested_delayed
is called on the object, which uses the original object data type to
choose which data type to get info for. So for curves and text it uses
the incorrect type (not the evaluated mesh like we hardcoded in the
armature overlay code).

To fix this I hardcoded the "delayed" generation to only use the
evaluated mesh. Luckily it wasn't use elsewhere besides this
armature overlay system. That seems like the simplest fix for
3.0. A proper solution should rewrite this whole area anyway.

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

Cleanup: Move node_shader_util.c to C++

This will allow using a function I've declared in a C++ header.

Cleanup: compiler warning

Cycles: fix bugs in point and spot light multiple importance sampling

* Spot lights are now handled as disks aligned with the direction of the
spotlight instead of view aligned disks.

* Point light is now handled separately from the spot light, to fix a case
where multiple lights are intersected in a row. Before the origin of the
ray was the previously intersected light and not the origin of the initial
ray traced from the last surface/volume interaction.

This makes both strategies in multiple importance sampling converge to the same
result. It changes the render results in some scenes, for example the junkshop
scene where there are large point lights overlapping scene geometry and each
other.

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

Cleanup: clarify material copying for hair and pointclouds

No functional change, just more clear this way it comes from src.

Fix some shortcut keys not working on macOS with Japanese input

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

Fix: Remove incorrect asserts for empty attributes

While it is an edge case, it isn't incorrect for the attribute storage
to have a zero size, it will just return an empty span or nothing.

Fix: Instances component does not copy attributes

Cleanup: Fix errors in previous commit

After 1ef8ef4941dd there were build warnings because of unused
arguments. Also missed to change code to iterate `strips` instead of
`seqbase` in 2 functions.

Geometry Nodes: deduplicate join geometry code

The Realize Instances and Join Geometry node can share most of their code.
Until now, both nodes had their own implementations though. This patch
removes the implementation in the Join Geometry node in favor of the more
general Realize Instances implementation.

This removes an optimization for avoiding spline copies. This can be brought
back later. The realize instances code has to be rewritten to support attribute
instances anyway.

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