浏览代码

Fixed a material functor compile error that mysteriously appeared.

Merge pull request #220 from aws-lumberyard-dev/Atom/santorac/FixedOverloadCompileError
santorac 4 年之前
父节点
当前提交
ae67b26e23

+ 2 - 1
Gem/Code/Lib/MaterialFunctors/StacksShaderCollectionFunctor.h

@@ -23,7 +23,8 @@ namespace AtomSampleViewer
         AZ_RTTI(StacksShaderCollectionFunctor, "{4E51A7D5-7DF1-4402-8975-F6C9DFDEDC1E}", AZ::RPI::MaterialFunctor);
 
         static void Reflect(AZ::ReflectContext* context);
-
+        
+        using AZ::RPI::MaterialFunctor::Process;
         void Process(RuntimeContext& context) override;
 
     private:

+ 2 - 1
Gem/Code/Lib/MaterialFunctors/StacksShaderInputFunctor.h

@@ -24,7 +24,8 @@ namespace AtomSampleViewer
         AZ_RTTI(StacksShaderInputFunctor, "{7F607170-1BC2-4510-A252-8A665FC02052}", AZ::RPI::MaterialFunctor);
 
         static void Reflect(AZ::ReflectContext* context);
-
+        
+        using AZ::RPI::MaterialFunctor::Process;
         void Process(RuntimeContext& context) override;
 
     private:

+ 2 - 1
Gem/Code/Tools/MaterialFunctors/StacksShaderCollectionFunctorSourceData.h

@@ -25,7 +25,8 @@ namespace AtomSampleViewer
         AZ_RTTI(StacksShaderCollectionFunctorSourceData, "{2B4678D5-5C1B-4BEE-99E5-9EC9FB871D37}", AZ::RPI::MaterialFunctorSourceData);
 
         static void Reflect(AZ::ReflectContext* context);
-
+        
+        using AZ::RPI::MaterialFunctorSourceData::CreateFunctor;
         FunctorResult CreateFunctor(const RuntimeContext& context) const override;
     };
 } // namespace AtomSampleViewer

+ 1 - 0
Gem/Code/Tools/MaterialFunctors/StacksShaderInputFunctorSourceData.h

@@ -24,6 +24,7 @@ namespace AtomSampleViewer
         static void Reflect(AZ::ReflectContext* context);
 
     private:
+        using AZ::RPI::MaterialFunctorSourceData::CreateFunctor;
         FunctorResult CreateFunctor(const RuntimeContext& context) const override;
     };