Merge pull request #648 from zavden/master

Fix the list of scenes.py
This commit is contained in:
Devin Neal 2019-07-24 16:10:05 -07:00 committed by GitHub
commit 9f761822e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -64,6 +64,8 @@ def is_child_scene(obj, module):
return False
if obj == Scene:
return False
if not obj.__module__.startswith(module.__name__):
return False
return True
@ -118,13 +120,16 @@ def get_scenes_to_render(scene_classes, config):
def get_scene_classes_from_module(module):
return [
member[1]
for member in inspect.getmembers(
module,
lambda x: is_child_scene(x, module)
)
]
if hasattr(module, "SCENES_IN_ORDER"):
return module.SCENES_IN_ORDER
else:
return [
member[1]
for member in inspect.getmembers(
module,
lambda x: is_child_scene(x, module)
)
]
def main(config):