Browse Source

build on Linux

David Rose 21 years ago
parent
commit
8636fb6221
2 changed files with 3 additions and 3 deletions
  1. 1 1
      panda/src/egg2pg/eggLoader.cxx
  2. 2 2
      panda/src/egg2pg/eggRenderState.I

+ 1 - 1
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;
   }

+ 2 - 2
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)
 {
 }