Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

premake4 add option --enable_static_vr_plugin to statically link the VR sync plugin

Browse Source 
fix texture caching from previous commit (what happened there?)
This commit is contained in:
erwincoumans
2017-10-25 10:00:45 -07:00
parent 9385f36505
commit 6a9300809d
9 changed files with 71 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/Importers/ImportObjDemo/ImportObjExample.cpp
View File

@@ -65,9 +65,9 @@ int loadAndRegisterMeshFromFile2(const std::string& fileName, CommonRenderInterf
{
int textureIndex = -1;
if (meshData.m_textureImage)
if (meshData.m_textureImage1)
{
textureIndex = renderer->registerTexture(meshData.m_textureImage,meshData.m_textureWidth,meshData.m_textureHeight);
textureIndex = renderer->registerTexture(meshData.m_textureImage1,meshData.m_textureWidth,meshData.m_textureHeight);
}
shapeId = renderer->registerShape(&meshData.m_gfxShape->m_vertices->at(0).xyzw[0],
@@ -77,7 +77,10 @@ int loadAndRegisterMeshFromFile2(const std::string& fileName, CommonRenderInterf
B3_GL_TRIANGLES,
textureIndex);
delete meshData.m_gfxShape;
delete meshData.m_textureImage;
if (!meshData.m_isCached)
{
delete meshData.m_textureImage1;
}
}
return shapeId;
}