From 990174f44e1ec1b9a5d693e05a6e01a8b20b1f28 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 6 Sep 2006 18:44:14 +0000 Subject: [PATCH] class TypedObject is a typed class --- dtool/src/interrogate/interfaceMakerPythonNative.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index aaec266003..7b2dfb1507 100755 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -2871,6 +2871,10 @@ bool InterfaceMakerPythonNative::DoesInheritFromIsClass( const CPPStructType * if(inclass == NULL) return false; + std::string scoped_name = inclass->get_fully_scoped_name(); + if(scoped_name == name) + return true; + CPPStructType::Derivation::const_iterator bi; for (bi = inclass->_derivation.begin(); bi != inclass->_derivation.end(); @@ -2882,10 +2886,6 @@ bool InterfaceMakerPythonNative::DoesInheritFromIsClass( const CPPStructType * CPPStructType *base_type = TypeManager::resolve_type(base._base)->as_struct_type(); if(base_type != NULL) { - std::string scoped_name = base_type->get_fully_scoped_name(); - if(scoped_name == name) - return true; - if(DoesInheritFromIsClass(base_type,name) == true) return true; }