Merge remote-tracking branch 'upstream/development' into amzn-tommy/gitflow_211116_o3de2

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-17 09:04:04 -08:00
parent 7bf5f86c05 8bccd36d03
commit 1e42261d76
32 changed files with 1491 additions and 578 deletions
@@ -9,11 +9,13 @@
 #pragma once

 #include <AzCore/Module/Module.h>
+#include <AzToolsFramework/API/PythonLoader.h>

 namespace AtomToolsFramework
 {
    class AtomToolsFrameworkModule
        : public AZ::Module
+        , public AzToolsFramework::EmbeddedPython::PythonLoader
    {
    public:
        AZ_RTTI(AtomToolsFrameworkModule, "{B58B7CA8-98C9-4DC8-8607-E094989BBBE2}", AZ::Module);