Integrating latest 47acbe8

Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderOptionGroup.cpp

@@ -41,9 +41,24 @@ namespace AZ
             AZ_Assert(m_layout, "ShaderOptionGroup created with null layout!");
         }
 
+        void ShaderOptionGroup::Reflect(AZ::ReflectContext* context)
+        {
+            if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
+            {
+                behaviorContext->Class<ShaderOptionGroup>()
+                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                    ->Attribute(AZ::Script::Attributes::Category, "Shader")
+                    ->Attribute(AZ::Script::Attributes::Module, "shader")
+                    ->Method("GetValueByOptionName", static_cast<ShaderOptionValue (ShaderOptionGroup::*)(const Name&) const>(&ShaderOptionGroup::GetValue))
+                    ->Method("GetShaderOptionDescriptors", &ShaderOptionGroup::GetShaderOptionDescriptors)
+                    ->Method("GetShaderVariantId", &ShaderOptionGroup::GetShaderVariantId)
+                    ;
+            }
+        }
+
         void ShaderOptionGroup::Clear()
         {
-            m_id.reset();
+            m_id.Reset();
         }
 
         ShaderOptionIndex ShaderOptionGroup::FindShaderOptionIndex(const Name& optionName) const
@@ -304,5 +319,10 @@ namespace AZ
             return s;
         }
 
+        const AZStd::vector<AZ::RPI::ShaderOptionDescriptor>& ShaderOptionGroup::GetShaderOptionDescriptors() const
+        {
+            return m_layout->GetShaderOptions();
+        }
+
     } // namespace RPI
 } // namespace AZ