From 8636fb622101ad050e891e93efaba0726b6786bb Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 14 Mar 2005 16:16:00 +0000
Subject: [PATCH] build on Linux

---
 panda/src/egg2pg/eggLoader.cxx    | 2 +-
 panda/src/egg2pg/eggRenderState.I | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx
index bffc385883..c6dda9d821 100644
--- a/panda/src/egg2pg/eggLoader.cxx
+++ b/panda/src/egg2pg/eggLoader.cxx
@@ -1957,7 +1957,7 @@ make_primitive(EggPrimitive *egg_prim, EggLoader::Primitives &primitives) {
     primitive = new qpGeomTristrips;
   }
 
-  if (primitive == NULL) {
+  if (primitive == (qpGeomPrimitive *)NULL) {
     // Don't know how to make this kind of primitive.
     return;
   }
diff --git a/panda/src/egg2pg/eggRenderState.I b/panda/src/egg2pg/eggRenderState.I
index 2c65c632f2..6f39221ef7 100644
--- a/panda/src/egg2pg/eggRenderState.I
+++ b/panda/src/egg2pg/eggRenderState.I
@@ -24,9 +24,9 @@
 ////////////////////////////////////////////////////////////////////
 EggRenderState::
 EggRenderState(EggLoader &loader) :
-  _loader(loader),
   _state(RenderState::make_empty()),
-  _hidden(false)
+  _hidden(false),
+  _loader(loader)
 {
 }