Merge pull request #1694 from seanpaultaylor/next

Fix for UI

gameplay/src/Control.cpp

@@ -67,7 +67,7 @@ void Control::initialize(const char* typeName, Theme::Style* style, Properties*
             // The passed in style is our parent control's style : attempt to load our style from it.
             _style = style->getTheme()->getStyle(styleName);
         }
-        else
+        if (!_style)
         {
             // Use an empty style from our parent's theme
             _style = style->getTheme()->getEmptyStyle();

gameplay/src/Theme.cpp

@@ -72,8 +72,6 @@ Theme* Theme::getDefault()
 
         if (!__defaultTheme)
         {
-            GP_WARN("No default theme detected.");
-
             // Create an empty theme so that UI's with no theme don't just crash
             __defaultTheme = new Theme();
             unsigned int color = 0x00000000;