From ad0d88d203b66110e266ab7704fdc29fba8c7a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 28 May 2024 08:39:50 +0200 Subject: [PATCH] Fix using the fcolor pmap when there is no face color --- Lab/demo/Lab/Scene_surface_mesh_item.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Lab/demo/Lab/Scene_surface_mesh_item.cpp b/Lab/demo/Lab/Scene_surface_mesh_item.cpp index 5c021784cd1..30e0d59ab83 100644 --- a/Lab/demo/Lab/Scene_surface_mesh_item.cpp +++ b/Lab/demo/Lab/Scene_surface_mesh_item.cpp @@ -626,11 +626,17 @@ void Scene_surface_mesh_item_priv::compute_elements(Scene_item_rendering_helper: } else if(is_convex) { - triangulate_convex_facet(fd, &fnormals, &fcolors.value(), nullptr, name, false); + if(has_fcolors) + triangulate_convex_facet(fd, &fnormals, &fcolors.value(), nullptr, name, false); + else + triangulate_convex_facet(fd, &fnormals, nullptr, nullptr, name, false); } else { - triangulate_facet(fd, &fnormals, &fcolors.value(), nullptr, name, false); + if(has_fcolors) + triangulate_facet(fd, &fnormals, &fcolors.value(), nullptr, name, false); + else + triangulate_facet(fd, &fnormals, nullptr, nullptr, name, false); } } }