Reverted changes in MaterialComponentController for an obsucre edge case. We'll handle the case of missing material assets more generally as a separate task.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-23 12:50:11 -07:00
parent 6b23e07af4
commit de932c62b3
2 changed files with 4 additions and 89 deletions
@@ -13,7 +13,6 @@
 #include <Atom/RPI.Public/Material/Material.h>
 #include <AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h>
 #include <AtomLyIntegration/CommonFeatures/Material/MaterialComponentConfig.h>
-#include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>

 namespace AZ
 {
@@ -23,7 +22,6 @@ namespace AZ
        //! to provide material overrides on a per-entity basis.
        class MaterialComponentController final
            : MaterialComponentRequestBus::Handler
-            , MeshComponentNotificationBus::Handler
            , Data::AssetBus::MultiHandler
            , TickBus::Handler
        {
@@ -77,9 +75,6 @@ namespace AZ
            // AZ::TickBus overrides...
            void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;

-            // MeshComponentNotificationBus overrides...
-            void OnModelReady(const Data::Asset<RPI::ModelAsset>& modelAsset, const Data::Instance<RPI::Model>& model) override;
-
            void LoadMaterials();
            void InitializeMaterialInstance(const Data::Asset<Data::AssetData>& asset);
            void ReleaseMaterials();