Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -65,7 +65,8 @@ namespace AZ
        };

        // ReflectionProbe manages all aspects of a single probe, including rendering, visualization, and cubemap generation
-        class ReflectionProbe final
+        class ReflectionProbe final :
+            public AZ::Data::AssetBus::MultiHandler
        {
        public:
            ReflectionProbe() = default;
@@ -114,6 +115,10 @@ namespace AZ

            void UpdateCulling();

+            // AZ::Data::AssetBus::Handler overrides...
+            void OnAssetReady(Data::Asset<Data::AssetData> asset) override;
+            void OnAssetError(Data::Asset<Data::AssetData> asset) override;
+
            // scene
            RPI::Scene* m_scene = nullptr;