From a333353af61ffb83000596953beaffda92996fa2 Mon Sep 17 00:00:00 2001 From: jspam Date: Thu, 6 Sep 2018 17:21:03 +0200 Subject: [PATCH] Make Loader.loadSound() accept a MovieAudio instance as soundPath This functionality seems to have inadvertently been removed by refactoring commit 23bf9ea5. Closes #383 --- direct/src/showbase/Loader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/direct/src/showbase/Loader.py b/direct/src/showbase/Loader.py index 17c9cea25e..924b396616 100644 --- a/direct/src/showbase/Loader.py +++ b/direct/src/showbase/Loader.py @@ -934,8 +934,8 @@ class Loader(DirectObject): just as in loadModel(); otherwise, the loading happens before loadSound() returns.""" - if not isinstance(soundPath, (MovieAudio, tuple, list, set)): - # We were given a single sound pathname. + if not isinstance(soundPath, (tuple, list, set)): + # We were given a single sound pathname or a MovieAudio instance. soundList = [soundPath] gotList = False else: