Merge branch 'blender-v4.5-release'

This commit is contained in:
Jeroen Bakker
2025-07-08 15:43:37 +02:00

View File

@@ -279,10 +279,16 @@ class Prepass : Overlay {
ResourceHandleRange res_handle = manager.unique_handle(ob_ref);
for (int material_id : geom_list.index_range()) {
/* Meshes with more than 16 materials can have nullptr in the geometry list as materials are
* not filled for unused materials indices. We should actually use `material_indices_used`
* but these are only available for meshes. */
if (geom_list[material_id] == nullptr) {
continue;
}
select::ID select_id = use_material_slot_selection_ ?
res.select_id(ob_ref, (material_id + 1) << 16) :
res.select_id(ob_ref);
if (res.is_selection() && (pass == mesh_ps_)) {
/* Conservative shader needs expanded draw-call. */
pass->draw_expand(