griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #145750: Overlay: Attempt to index a handle range as a single handle

Browse Source 
This fixes the resource indexing logic, but it looks like the flat
object outline workaround has been broken since 4.4.

Pull Request: https://projects.blender.org/blender/blender/pulls/147703
This commit is contained in:
Miguel Pozo
2025-10-09 16:58:25 +02:00
parent d68680ed61
commit 83a1bd4e1d
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/overlay/overlay_outline.hh
View File

@@ -210,8 +210,8 @@ class Outline : Overlay {
for (FlatObjectRef flag_ob_ref : flat_objects_) {
flag_ob_ref.if_flat_axis_orthogonal_to_view(
manager, view, [&](gpu::Batch *geom, ResourceHandleRange handle) {
pass.draw_expand(geom, GPU_PRIM_LINES, 1, 1, handle);
manager, view, [&](gpu::Batch *geom, ResourceIndex resource_index) {
pass.draw_expand(geom, GPU_PRIM_LINES, 1, 1, resource_index);
});
}
}

24
source/blender/draw/engines/overlay/overlay_private.hh
View File

@@ -1014,24 +1014,26 @@ struct FlatObjectRef {
return -1;
}
using Callback = FunctionRef<void(gpu::Batch *geom, ResourceHandleRange handle)>;
using Callback = FunctionRef<void(gpu::Batch *geom, ResourceIndex handle)>;
/* Execute callback for every handles that is orthogonal to the view.
* Note: Only works in orthogonal view. */
void if_flat_axis_orthogonal_to_view(Manager &manager, const View &view, Callback callback) const
{
const float4x4 &object_to_world =
manager.matrix_buf.current().get_or_resize(handle.resource_index()).model;
for (ResourceIndex resource_index : handle.index_range()) {
const float4x4 &object_to_world =
manager.matrix_buf.current().get_or_resize(resource_index.resource_index()).model;
float3 view_forward = view.forward();
float3 axis_not_flat_a = (flattened_axis_id == 0) ? object_to_world.y_axis() :
object_to_world.x_axis();
float3 axis_not_flat_b = (flattened_axis_id == 1) ? object_to_world.z_axis() :
object_to_world.y_axis();
float3 axis_flat = math::cross(axis_not_flat_a, axis_not_flat_b);
float3 view_forward = view.forward();
float3 axis_not_flat_a = (flattened_axis_id == 0) ? object_to_world.y_axis() :
object_to_world.x_axis();
float3 axis_not_flat_b = (flattened_axis_id == 1) ? object_to_world.z_axis() :
object_to_world.y_axis();
float3 axis_flat = math::cross(axis_not_flat_a, axis_not_flat_b);
if (math::abs(math::dot(view_forward, axis_flat)) < 1e-3f) {
callback(geom, handle);
if (math::abs(math::dot(view_forward, axis_flat)) < 1e-3f) {
callback(geom, resource_index);
}
}
}
};