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

Fix a multithreading crash caused by modification of live Geometry

Browse Source
This commit is contained in:
scrawl 2017-03-01 03:35:43 +01:00
parent 2873c10284
commit d8505e4f48
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/shader/shadervisitor.cpp
View File

@ -318,9 +318,9 @@ namespace Shader
const ShaderRequirements& reqs = mRequirements.back(); const ShaderRequirements& reqs = mRequirements.back();
bool useShader = reqs.mShaderRequired || mForceShaders; bool useShader = reqs.mShaderRequired || mForceShaders;
bool generateTangents = reqs.mTexStageRequiringTangents != -1 && mAllowedToModifyStateSets; bool generateTangents = reqs.mTexStageRequiringTangents != -1;
if (useShader || generateTangents) if (mAllowedToModifyStateSets && (useShader || generateTangents))
{ {
osg::ref_ptr<osg::Geometry> sourceGeometry = &geometry; osg::ref_ptr<osg::Geometry> sourceGeometry = &geometry;
SceneUtil::RigGeometry* rig = dynamic_cast<SceneUtil::RigGeometry*>(&geometry); SceneUtil::RigGeometry* rig = dynamic_cast<SceneUtil::RigGeometry*>(&geometry);
@ -329,16 +329,13 @@ namespace Shader
bool requiresSetGeometry = false; bool requiresSetGeometry = false;
if (mAllowedToModifyStateSets) // make sure that all UV sets are there
for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end(); ++it)
{ {
// make sure that all UV sets are there if (sourceGeometry->getTexCoordArray(it->first) == NULL)
for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end(); ++it)
{ {
if (sourceGeometry->getTexCoordArray(it->first) == NULL) sourceGeometry->setTexCoordArray(it->first, sourceGeometry->getTexCoordArray(0));
{ requiresSetGeometry = true;
sourceGeometry->setTexCoordArray(it->first, sourceGeometry->getTexCoordArray(0));
requiresSetGeometry = true;
}
} }
} }