diff --git a/direct/src/ffi/FFIOverload.py b/direct/src/ffi/FFIOverload.py index 7faf33aa83..dbff68d115 100644 --- a/direct/src/ffi/FFIOverload.py +++ b/direct/src/ffi/FFIOverload.py @@ -138,16 +138,21 @@ def inheritsFrom(type1, type2): def getInheritanceLevel(type, checkNested = 1): # if (len(type.parentTypes) == 0): # return 0 + ##if type.isNested: + ## level = 1+getInheritanceLevel(type.outerType, 0) + ##else: + ## level = 0 + level = 0 if type.isNested: - level = 1+getInheritanceLevel(type.outerType, 0) + offset = getInheritanceLevel(type.outerType, 0) else: - level = 0 + offset = 0 for parentType in type.parentTypes: level = max(level, 1+getInheritanceLevel(parentType)) if checkNested: for nestedType in type.nestedTypes: level = max(level, 1+getInheritanceLevel(nestedType)) - return level + return level + offset def inheritanceLevelSort(type1, type2): level1 = getInheritanceLevel(type1) diff --git a/direct/src/gui/GuiGlobals.py b/direct/src/gui/GuiGlobals.py index 7d7084a81b..3497c6ee53 100644 --- a/direct/src/gui/GuiGlobals.py +++ b/direct/src/gui/GuiGlobals.py @@ -40,7 +40,7 @@ def getNewRolloverFunctor(sound = None): if sound: roll = sound else: - roll = loader.loadSound("phase_3/audio/sfr/GUI_rollover.mp3") + roll = loader.loadSound("phase_3/audio/sfx/GUI_rollover.mp3") val = AudioGuiFunctor(roll) else: val = AudioGuiFunctor()