mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-29 08:15:18 -04:00
showbase: Fix import of Loader if AudioLoadRequest is not available
This commit is contained in:
parent
86aa437804
commit
ae4151c9e1
@ -5,7 +5,6 @@ sound, music, shaders and fonts from disk.
|
|||||||
__all__ = ['Loader']
|
__all__ = ['Loader']
|
||||||
|
|
||||||
from panda3d.core import (
|
from panda3d.core import (
|
||||||
AudioLoadRequest,
|
|
||||||
ConfigVariableBool,
|
ConfigVariableBool,
|
||||||
Filename,
|
Filename,
|
||||||
FontPool,
|
FontPool,
|
||||||
@ -977,6 +976,8 @@ class Loader(DirectObject):
|
|||||||
just as in loadModel(); otherwise, the loading happens before
|
just as in loadModel(); otherwise, the loading happens before
|
||||||
loadSound() returns."""
|
loadSound() returns."""
|
||||||
|
|
||||||
|
from panda3d.core import AudioLoadRequest
|
||||||
|
|
||||||
if not isinstance(soundPath, (tuple, list, set)):
|
if not isinstance(soundPath, (tuple, list, set)):
|
||||||
# We were given a single sound pathname or a MovieAudio instance.
|
# We were given a single sound pathname or a MovieAudio instance.
|
||||||
soundList = [soundPath]
|
soundList = [soundPath]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user