From 3bacd69caff6255ec643a2863b26afa74d0b7c3e Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 24 Nov 2015 13:39:42 +0100
Subject: [PATCH] Fix GeomTextGlyph warning when compiling without freetype

---
 panda/src/text/config_text.cxx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/panda/src/text/config_text.cxx b/panda/src/text/config_text.cxx
index 086f0f58d8..f036b7112b 100644
--- a/panda/src/text/config_text.cxx
+++ b/panda/src/text/config_text.cxx
@@ -22,7 +22,6 @@
 #include "dynamicTextGlyph.h"
 #include "dynamicTextPage.h"
 #include "geomTextGlyph.h"
-#include "geomTextGlyph.h"
 #include "unicodeLatinMap.h"
 #include "pandaSystem.h"
 
@@ -217,21 +216,19 @@ init_libtext() {
   }
   initialized = true;
 
+  GeomTextGlyph::init_type();
   StaticTextFont::init_type();
   TextFont::init_type();
   TextGlyph::init_type();
   TextNode::init_type();
   TextProperties::init_type();
 
+  GeomTextGlyph::register_with_read_factory();
+
 #ifdef HAVE_FREETYPE
   DynamicTextFont::init_type();
   DynamicTextGlyph::init_type();
   DynamicTextPage::init_type();
-  GeomTextGlyph::init_type();
-  GeomTextGlyph::init_type();
-
-  GeomTextGlyph::register_with_read_factory();
-  GeomTextGlyph::register_with_read_factory();
 
   PandaSystem *ps = PandaSystem::get_global_ptr();
   ps->add_system("Freetype");