mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #187 from OpenMW/master

Browse source 
Add OpenMW commits up to 20 Mar 2017
This commit is contained in:
David Cernat 2017-03-20 04:59:12 +02:00 committed by GitHub
commit ab92b9f795
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/esm/loadscpt.cpp
View file

@ -83,10 +83,24 @@ namespace ESM
loadSCVR(esm);
break;
case ESM::FourCC<'S','C','D','T'>::value:
{
// compiled script
mScriptData.resize(mData.mScriptDataSize);
esm.getHExact(&mScriptData[0], mScriptData.size());
esm.getSubHeader();
uint32_t subSize = esm.getSubSize();
if (subSize != static_cast<uint32_t>(mData.mScriptDataSize))
{
std::stringstream ss;
ss << "ESM Warning: Script data size defined in SCHD subrecord does not match size of SCDT subrecord";
ss << "\n File: " << esm.getName();
ss << "\n Offset: 0x" << std::hex << esm.getFileOffset();
std::cerr << ss.str() << std::endl;
}
mScriptData.resize(subSize);
esm.getExact(&mScriptData[0], mScriptData.size());
break;
}
case ESM::FourCC<'S','C','T','X'>::value:
mScriptText = esm.getHString();
break;

4
components/terrain/compositemaprenderer.cpp
View file

@ -88,6 +88,10 @@ void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &
return;
}
// inform State that Texture attribute has changed due to compiling of FBO texture
// should OSG be doing this on its own?
state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), osg::StateAttribute::TEXTURE);
for (unsigned int i=compositeMap.mCompiled; i<compositeMap.mDrawables.size(); ++i)
{
osg::Drawable* drw = compositeMap.mDrawables[i];