pulling in latest

Signed-off-by: Scott Murray <scottmur@amazon.com>
2022-02-15 13:10:12 -08:00
parent 9335ce7ba9 de97ad6ade
commit 5124a6322d
507 changed files with 16931 additions and 7774 deletions
@@ -162,11 +162,11 @@ def select_model_config(configname):
    azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "SelectModelPresetByName", configname)


-def destroy_main_window():
+def exit():
    """
-    Closes the Material Editor window
+    Closes the Material Editor
    """
-    azlmbr.atomtools.AtomToolsMainWindowFactoryRequestBus(azlmbr.bus.Broadcast, "DestroyMainWindow")
+    azlmbr.atomtools.general.exit()


 def wait_for_condition(function, timeout_in_seconds=1.0):
@@ -214,7 +214,7 @@ def run():
                                       (not material_editor.is_open(document1_id)) and
                                       (not material_editor.is_open(document2_id)) and
                                       (not material_editor.is_open(document3_id)), 2.0)
-    material_editor.destroy_main_window()
+    material_editor.exit()


 if __name__ == "__main__":