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

Build fix for MyGUI 3.2.1

Browse source
This commit is contained in:
scrawl 2015-06-04 17:13:42 +02:00
parent 30053140a1
commit 231b217664
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/fontloader/fontloader.cpp
View file

@ -274,8 +274,6 @@ namespace Gui
else if (name.size() >= 7 && Misc::StringUtils::ciEqual(name.substr(0, 7), "daedric")) else if (name.size() >= 7 && Misc::StringUtils::ciEqual(name.substr(0, 7), "daedric"))
resourceName = "Daedric"; resourceName = "Daedric";
std::string textureName = name;
if (exportToFile) if (exportToFile)
{ {
osg::ref_ptr<osg::Image> image = new osg::Image; osg::ref_ptr<osg::Image> image = new osg::Image;
@ -298,8 +296,6 @@ namespace Gui
memcpy(texData, &textureData[0], textureData.size()); memcpy(texData, &textureData[0], textureData.size());
tex->unlock(); tex->unlock();
font->setSource(bitmapFilename);
// Using ResourceManualFont::setTexture, enable for MyGUI 3.2.3 // Using ResourceManualFont::setTexture, enable for MyGUI 3.2.3
/* /*
osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D; osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
@ -319,7 +315,7 @@ namespace Gui
defaultHeight->addAttribute("value", fontSize); defaultHeight->addAttribute("value", fontSize);
MyGUI::xml::ElementPtr source = root->createChild("Property"); MyGUI::xml::ElementPtr source = root->createChild("Property");
source->addAttribute("key", "Source"); source->addAttribute("key", "Source");
source->addAttribute("value", std::string(textureName)); source->addAttribute("value", std::string(bitmapFilename));
MyGUI::xml::ElementPtr codes = root->createChild("Codes"); MyGUI::xml::ElementPtr codes = root->createChild("Codes");
for(int i = 0; i < 256; i++) for(int i = 0; i < 256; i++)