TangentSpaceCalc::populateVertexArray leaves hardware buffers locked when throwing an exception

[Spectre-srs]

System Information

• Ogre Version: 2.1.0 (Baldur)
• Operating System / Platform: Windows //probably irrelevant
• RenderSystem: OpenGL //maybe irrelevant

Detailled description

• in file "OgreTangentSpaceCalc.cpp"
• in TangentSpaceCalc::populateVertexArray

on lines 576 and 593, two hardware buffers are being locked:

pUvBase = static_cast<unsigned char*>(uvBuf->lock(HardwareBuffer::HBL_READ_ONLY));
pUvBase = static_cast<unsigned char*>(uvBuf->lock(HardwareBuffer::HBL_READ_ONLY));

after that, on line 600, code checks if model has normals and throws an exception if not:

const VertexElement *normElem = dcl->findElementBySemantic(VES_NORMAL);
if (!normElem)
    OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "No vertex normals found", "TangentSpaceCalc::build");

which leaves buffers in a locked state, cascading down into further problems, for example:

• in file "OgreMesh2.cpp"
• in Mesh::importV1

on line 526 is a try-catch block that encapsulates calculation of tangents, captures this exception from it, ignores it and continues, immediately running into the already locked buffer exception in SubMesh::importFromV1 method on line 546

[darksylinc]

Fixed. Thanks for the report!