Merge remote-tracking branch 'bp/master' into pullRequest

This commit is contained in:
jietan
2018-03-14 20:19:31 -07:00

View File

@@ -8679,7 +8679,7 @@ bool PhysicsServerCommandProcessor::processLoadTextureCommand(const struct Share
int uid = -1;
if (m_data->m_pluginManager.getRenderInterface())
{
m_data->m_pluginManager.getRenderInterface()->loadTextureFile(relativeFileName);
uid = m_data->m_pluginManager.getRenderInterface()->loadTextureFile(relativeFileName);
}
if(uid>=0)
{