mod_moder/blender
mod_moder/blender
0
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

index-of-nearest-104619 #2

Merged
Iliya Katushenock merged 62 commits from HooglyBoogly/blender:index-of-nearest-104619 into index_of_nearest 2023-04-20 21:19:53 +02:00
Conversation 0 Commits 62 Files Changed 226 +5 -2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 097b9c5a36 - Show all commits

3
source/blender/compositor/realtime_compositor/intern/shader_node.cc
View File

@ -98,6 +98,7 @@ static void gpu_stack_vector_from_socket(GPUNodeStack &stack, const bNodeSocket
return;
default:
BLI_assert_unreachable();
return;
}
}
case SOCK_VECTOR: {
@ -115,6 +116,7 @@ static void gpu_stack_vector_from_socket(GPUNodeStack &stack, const bNodeSocket
return;
default:
BLI_assert_unreachable();
return;
}
}
case SOCK_RGBA: {
@ -131,6 +133,7 @@ static void gpu_stack_vector_from_socket(GPUNodeStack &stack, const bNodeSocket
return;
default:
BLI_assert_unreachable();
return;
}
}
default:

2
source/blender/geometry/GEO_mesh_to_curve.hh
View File

@ -25,7 +25,7 @@ bke::CurvesGeometry mesh_to_curve_convert(
const bke::AnonymousAttributePropagationInfo &propagation_info);
bke::CurvesGeometry create_curve_from_vert_indices(
const Mesh &mesh,
const bke::AttributeAccessor &mesh_attributes,
Span<int> vert_indices,
Span<int> curve_offsets,
IndexRange cyclic_curves,

2
source/blender/nodes/geometry/nodes/node_geo_edge_paths_to_curves.cc
View File

@ -61,7 +61,7 @@ static Curves *edge_paths_to_curves_convert(
return nullptr;
}
Curves *curves_id = bke::curves_new_nomain(geometry::create_curve_from_vert_indices(
mesh, vert_indices, curve_offsets, IndexRange(0), propagation_info));
mesh.attributes(), vert_indices, curve_offsets, IndexRange(0), propagation_info));
return curves_id;
}