Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix

monroegm-disable-blank-issue-2
Sergey Pereslavtsev 4 years ago
commit 8d30524028

@ -136,7 +136,7 @@ namespace AZ::CommonOnDemandReflections
->template Constructor<typename ContainerType::value_type*>()
->Attribute(AZ::Script::Attributes::ConstructorOverride, &OnDemandLuaFunctions::ConstructStringView<ContainerType::value_type, ContainerType::traits_type>)
->Attribute(AZ::Script::Attributes::ReaderWriterOverride, ScriptContext::CustomReaderWriter(&OnDemandLuaFunctions::StringTypeToLua<ContainerType>, &OnDemandLuaFunctions::StringTypeFromLua<ContainerType>))
->Method("ToString", [](const ContainerType& stringView) { return static_cast<AZStd::string>(stringView).c_str(); }, { { { "Reference", "String view object being converted to string" } } })
->Method("ToString", [](const ContainerType& stringView) { return stringView.data(); }, { { { "Reference", "String view object being converted to string" } } })
->Attribute(AZ::Script::Attributes::ToolTip, "Converts string_view to string")
->Attribute(AZ::Script::Attributes::Operator, AZ::Script::Attributes::OperatorType::ToString)
->template WrappingMember<const char*>(&ContainerType::data)

@ -50,8 +50,7 @@
"FilePath": "Shaders/PostProcessing/SsaoCompute.shader"
},
"Make Fullscreen Pass": true,
"PipelineViewTag": "MainCamera",
"Use Async Compute": true
"PipelineViewTag": "MainCamera"
},
"FallbackConnections": [
{

@ -55,7 +55,6 @@ ly_append_configurations_options(
-Wno-parentheses
-Wno-reorder
-Wno-restrict
-Wno-return-local-addr
-Wno-sequence-point
-Wno-sign-compare
-Wno-strict-aliasing

Loading…
Cancel
Save