Merge branch 'main' into ly-as-sdk/LYN-2948

# Conflicts: # Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
2021-05-27 10:39:37 -07:00
parent cba5c35de5 e1e1217c6a
commit 01933f45b1
290 changed files with 4267 additions and 4915 deletions
@@ -72,6 +72,11 @@ namespace SceneBuilder
        m_sceneBuilder.BusDisconnect();
    }

+    void BuilderPluginComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+    {
+        required.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
+    }
+
    void BuilderPluginComponent::Reflect(AZ::ReflectContext* context)
    {
        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
@@ -81,5 +86,4 @@ namespace SceneBuilder
                ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AssetBuilderSDK::ComponentTags::AssetBuilder }));
        }
    }
-
 } // namespace SceneBuilder
@@ -32,6 +32,8 @@ namespace SceneBuilder
        void Activate() override;
        void Deactivate() override;
        
+        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        
    private:
        SceneBuilderWorker m_sceneBuilder;
    };