dmuratshin 9 years ago
parent
commit
6048e915d4
2 changed files with 3 additions and 2 deletions
  1. 1 1
      oxygine/src/Sprite.cpp
  2. 2 1
      oxygine/src/TextField.cpp

+ 1 - 1
oxygine/src/Sprite.cpp

@@ -234,7 +234,7 @@ namespace oxygine
     {
     {
         _VStyleActor::serialize(data);
         _VStyleActor::serialize(data);
 
 
-        pugi::xml_node node = data->node;        
+        pugi::xml_node node = data->node;
 
 
         const ResAnim* rs = getResAnim();
         const ResAnim* rs = getResAnim();
         if (rs)
         if (rs)

+ 2 - 1
oxygine/src/TextField.cpp

@@ -386,7 +386,8 @@ namespace oxygine
         if (fnt && *fnt)
         if (fnt && *fnt)
         {
         {
             ResFont* font = data->factory->getResFont(fnt);
             ResFont* font = data->factory->getResFont(fnt);
-            _style.font = font->getFont();
+            if (font)
+                _style.font = font->getFont();
         }
         }
 
 
         needRebuild();
         needRebuild();