teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-08-31 09:22:19 +02:00
commit 7a96a04b75
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/journalwindow.cpp
View file

@ -356,6 +356,8 @@ namespace
setVisible (OptionsOverlay, false); setVisible (OptionsOverlay, false);
setVisible (OptionsBTN, true); setVisible (OptionsBTN, true);
setVisible (JournalBTN, true); setVisible (JournalBTN, true);
mOptionsMode = false;
} }
void notifyTopicSelected (const std::string& topic, int id) void notifyTopicSelected (const std::string& topic, int id)
@ -383,6 +385,8 @@ namespace
setVisible (OptionsOverlay, false); setVisible (OptionsOverlay, false);
setVisible (OptionsBTN, true); setVisible (OptionsBTN, true);
setVisible (JournalBTN, true); setVisible (JournalBTN, true);
mOptionsMode = false;
} }
void notifyOptions(MyGUI::Widget* _sender) void notifyOptions(MyGUI::Widget* _sender)

26
components/sceneutil/clone.cpp
View file

@ -52,6 +52,32 @@ namespace SceneUtil
{ {
osg::CopyOp copyop = *this; osg::CopyOp copyop = *this;
copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_ARRAYS); copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_ARRAYS);
/*
Deep copy of primitives required to work around the following (bad?) code in osg::Geometry copy constructor:
if ((copyop.getCopyFlags() & osg::CopyOp::DEEP_COPY_ARRAYS))
{
if (_useVertexBufferObjects)
{
// copying of arrays doesn't set up buffer objects so we'll need to force
// Geometry to assign these, we'll do this by switching off VBO's then renabling them.
setUseVertexBufferObjects(false);
setUseVertexBufferObjects(true);
}
}
In case of DEEP_COPY_PRIMITIVES=Off, DEEP_COPY_ARRAYS=On, the above code makes a modification to the original const Geometry& we copied from,
causing problems if we relied on the original Geometry to remain static such as when it was added to an osgUtil::IncrementalCompileOperation.
Possible fix submitted to osg-submissions ( http://forum.openscenegraph.org/viewtopic.php?t=15217 ).
*/
copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_PRIMITIVES);
osg::Drawable* cloned = osg::clone(drawable, copyop); osg::Drawable* cloned = osg::clone(drawable, copyop);
if (cloned->getUpdateCallback()) if (cloned->getUpdateCallback())
cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this)); cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this));