Merge branch 'edgelord' into 'master'

Fix UB when pathgrid geometry is generated and all pathgrid edges are invalid

See merge request OpenMW/openmw!4541
This commit is contained in:
psi29a 2025-02-17 15:01:15 +00:00
commit 6ede5635b3

View File

@ -126,9 +126,9 @@ namespace SceneUtil
gridGeometry->setVertexArray(vertices);
gridGeometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
if (pointIndexCount)
if (!pointIndices->empty())
gridGeometry->addPrimitiveSet(pointIndices);
if (edgeIndexCount)
if (!lineIndices->empty())
gridGeometry->addPrimitiveSet(lineIndices);
gridGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
}