mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
Code Issues Projects Releases Wiki Activity

Make sure strips have valid size

Browse Source
This commit is contained in:
capostrophic 2019-08-08 15:41:09 +03:00
parent 6599a28ecf
commit b4f54651f8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/nifbullet/bulletnifloader.cpp
View File

@ -63,7 +63,7 @@ void fillTriangleMeshWithTransform(btTriangleMesh& mesh, const Nif::NiTriStripsD
// Assume every strip has the same size
const int singleStripSize = static_cast<int>(strips[0].size());
// Can't make a triangle from 2 vertices or less.
// Can't make a triangle from less than three vertices.
if (singleStripSize < 3)
return;

4
components/nifosg/nifloader.cpp
View File

@ -1128,6 +1128,10 @@ namespace NifOsg
{
for (const std::vector<unsigned short>& strip : data->strips)
{
// Can't make a triangle from less than three vertices.
// All strips have the same size.
if (strip.size() < 3)
break;
geometry->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP,
strip.size(), (unsigned short*)strip.data()));
}