new egg loader refinements

panda/src/builder/builderBucket.cxx

@@ -192,6 +192,9 @@ operator < (const BuilderBucket &other) const {
   if (compare != 0) {
     return (compare < 0);
   }
+  if (_state != other._state) {
+    return _state < other._state;
+  }
 
   return BuilderProperties::operator < (other);
 }

panda/src/egg2pg/qpeggLoader.cxx

@@ -1455,18 +1455,15 @@ make_node(EggGroup *egg_group, PandaNode *parent) {
     */
 
   } else if (egg_group->get_model_flag() || egg_group->get_dcs_flag()) {
-    /*
     // A model or DCS flag; create a model node.
-    node = new ModelNode;
-    node->set_name(egg_group->get_name());
+    node = new PandaNode(egg_group->get_name());
 
-    DCAST(ModelNode, node)->set_preserve_transform(egg_group->get_dcs_flag());
+    //    DCAST(ModelNode, node)->set_preserve_transform(egg_group->get_dcs_flag());
 
     EggGroup::const_iterator ci;
     for (ci = egg_group->begin(); ci != egg_group->end(); ++ci) {
       make_node(*ci, node);
     }
-    */
 
   } else {
     // A normal group; just create a normal node, and traverse.