Browse Source

remove bogus asserts

David Rose 22 years ago
parent
commit
875d17c52a
1 changed files with 1 additions and 2 deletions
  1. 1 2
      panda/src/pgraph/nodePath.cxx

+ 1 - 2
panda/src/pgraph/nodePath.cxx

@@ -404,7 +404,6 @@ copy_to(const NodePath &other, int sort) const {
   nassertr(verify_complete(), fail());
   nassertr(verify_complete(), fail());
   nassertr(other.verify_complete(), fail());
   nassertr(other.verify_complete(), fail());
   nassertr_always(!is_empty(), fail());
   nassertr_always(!is_empty(), fail());
-  nassertr(!other.is_empty(), fail());
   nassertr(other._error_type == ET_ok, fail());
   nassertr(other._error_type == ET_ok, fail());
 
 
   PandaNode *source_node = node();
   PandaNode *source_node = node();
@@ -435,7 +434,7 @@ copy_to(const NodePath &other, int sort) const {
 NodePath NodePath::
 NodePath NodePath::
 attach_new_node(PandaNode *node, int sort) const {
 attach_new_node(PandaNode *node, int sort) const {
   nassertr(verify_complete(), NodePath::fail());
   nassertr(verify_complete(), NodePath::fail());
-  nassertr_always(!is_empty(), NodePath::fail());
+  nassertr(_error_type == ET_ok, NodePath::fail());
   nassertr(node != (PandaNode *)NULL, NodePath::fail());
   nassertr(node != (PandaNode *)NULL, NodePath::fail());
 
 
   NodePath new_path(*this);
   NodePath new_path(*this);