OS X compile fixes

This commit is contained in:
Jonas Strandstedt
2014-12-04 11:20:28 +01:00
parent cb526c7736
commit d7487f601c
3 changed files with 7 additions and 3 deletions
@@ -40,7 +40,7 @@ public:
virtual void preRender();
virtual void postRender();
virtual std::string settings();
std::vector<fragmentData> pixelData();
protected:
virtual bool reinitializeInternal();
+2 -2
View File
@@ -60,8 +60,8 @@ void ABufferFramebuffer::postRender() {
}
std::string ABufferFramebuffer::settings() {
return R"()";
std::vector<ABuffer::fragmentData> ABufferFramebuffer::pixelData() {
return std::vector<ABuffer::fragmentData>();
}
+4
View File
@@ -222,6 +222,10 @@ void OpenSpaceEngine::loadFonts() {
std::string font;
fonts.getValue(key, font);
font = absPath(font);
if(!FileSys.fileExists(font)) {
LERROR("Could not find font '" << font << "'");
continue;
}
LINFO("Registering font '" << font << "' with key '" << key << "'");
sgct_text::FontManager::instance()->addFont(key, font, local);