birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

Browse Source
This commit is contained in:
nvsickle
2021-06-18 13:25:53 -07:00
parent 34e64ca5b0 7486488b60
commit e55580af57
578 changed files with 19526 additions and 20039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperConfigurationDescriptor.cpp
+12 -1
View File
@@ -50,7 +50,18 @@ namespace AZ
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->Class<OutputDeviceTransformType>("OutputDeviceTransformType");
behaviorContext->Class<OutputDeviceTransformType>("OutputDeviceTransformType")
->Enum<OutputDeviceTransformType::OutputDeviceTransformType_48Nits>("OutputDeviceTransformType_48Nits")
->Attribute(AZ::Script::Attributes::Module, "atom")
->Enum<OutputDeviceTransformType::OutputDeviceTransformType_1000Nits>("OutputDeviceTransformType_100Nits")
->Attribute(AZ::Script::Attributes::Module, "atom")
->Enum<OutputDeviceTransformType::OutputDeviceTransformType_2000Nits>("OutputDeviceTransformType_2000Nits")
->Attribute(AZ::Script::Attributes::Module, "atom")
->Enum<OutputDeviceTransformType::OutputDeviceTransformType_4000Nits>("OutputDeviceTransformType_4000Nits")
->Attribute(AZ::Script::Attributes::Module, "atom")
->Enum<OutputDeviceTransformType::NumOutputDeviceTransformTypes>("OutputDeviceTransformType_NumOutputDeviceTransformTypes")
->Attribute(AZ::Script::Attributes::Module, "atom")
;
behaviorContext->Class<AcesParameterOverrides>("AcesParameterOverrides")
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)