diff --git a/panda/src/express/memoryInfo.cxx b/panda/src/express/memoryInfo.cxx index 003368399f..a58532677d 100644 --- a/panda/src/express/memoryInfo.cxx +++ b/panda/src/express/memoryInfo.cxx @@ -118,7 +118,7 @@ determine_dynamic_type() { _dynamic_type = _static_type; _flags &= ~F_reconsider_dynamic_type; - nassert_raise("Unregistered type."); + //nassert_raise("Unregistered type"); return; } @@ -133,7 +133,7 @@ determine_dynamic_type() { } } else { - express_cat.error() + express_cat.warning() << "Pointer " << (void *)_ref_ptr << " previously indicated as type " << orig_type << " is now type " << got_type << "!\n"; } diff --git a/panda/src/putil/copyOnWriteObject.I b/panda/src/putil/copyOnWriteObject.I index 8d45795a68..493965d4f7 100644 --- a/panda/src/putil/copyOnWriteObject.I +++ b/panda/src/putil/copyOnWriteObject.I @@ -145,9 +145,9 @@ init_type() { TypeHandle base_type = register_dynamic_type(base_name); - CachedTypedWritableReferenceCount::init_type(); + CopyOnWriteObject::init_type(); _type_handle = register_dynamic_type("CopyOnWriteObj<" + base_name + ">", base_type, - CachedTypedWritableReferenceCount::get_class_type()); + CopyOnWriteObject::get_class_type()); }