From 77a95c38501f9e50f0ac7770e4991df632130bff Mon Sep 17 00:00:00 2001
From: sven <sjm324@cornell.edu>
Date: Fri, 9 Mar 2018 12:15:44 -0800
Subject: [PATCH] minor cleanup (OTF removed, bilbo font gone)

---
 README.md            | 2 +-
 cpp/custom_theme.hpp | 8 +-------
 ext/nanogui          | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ab94887..f67ba9e 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ build/
         ...
         custom_theme_and_fonts.py
         custom_icon_theme_and_fonts.py
-        theme_buildter.py
+        theme_builder.py
     icons/
         icon1.png ...
 ```
diff --git a/cpp/custom_theme.hpp b/cpp/custom_theme.hpp
index 1e89f98..d7a33d9 100644
--- a/cpp/custom_theme.hpp
+++ b/cpp/custom_theme.hpp
@@ -20,11 +20,6 @@ enum class ThemeChoice {
     Fontawesome ///< The 'FontawesomeTheme' class
 };
 
-
-#pragma once
-
-#include <nanogui/theme.h>
-
 /*
 The JSON for this class::
 
@@ -96,8 +91,7 @@ class CustomTheme : public nanogui::Theme {
         mSpiraxFont = nanogui::createFontMem(ctx, "spirax", "Spirax-Regular.ttf");
         mMembraFont = nanogui::createFontMem(ctx, "membra", "membra.ttf");
 
-        // not forcing failure if mBilboFont is not loaded so that if Freetype was not
-        // found the application can still run
+        // -1 means font could not be loaded
         if (mSpiraxFont == -1 || mMembraFont == -1)
             throw std::runtime_error("Could not load the `spirax` or `membra` fonts!");
 
diff --git a/ext/nanogui b/ext/nanogui
index 273d69e..04fdb9f 160000
--- a/ext/nanogui
+++ b/ext/nanogui
@@ -1 +1 @@
-Subproject commit 273d69eece4d125487e41c9a7f71cf0ba86a5fa0
+Subproject commit 04fdb9fcfe916768fdfbfdd8801470a85b7faee4