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

This commit is contained in:
chcurran
2021-09-02 18:14:39 -07:00
334 changed files with 3022 additions and 2797 deletions
@@ -165,4 +165,22 @@ namespace ScriptCanvas
runtimeVersion = RuntimeVersion::Current;
fileVersion = FileVersion::Current;
}
void ReflectEventTypeOnDemand(const AZ::TypeId& typeId, AZStd::string_view name, AZ::IRttiHelper* rttiHelper)
{
AZ::SerializeContext* serializeContext{};
AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
AZ::SerializeContext::ClassData classData;
classData.m_name = name.data();
classData.m_typeId = typeId;
classData.m_azRtti = rttiHelper;
auto EventPlaceholderAnyCreator = [](AZ::SerializeContext*) -> AZStd::any
{
return AZStd::make_any<AZStd::monostate>();
};
serializeContext->RegisterType(typeId, AZStd::move(classData), EventPlaceholderAnyCreator);
}
}
@@ -293,6 +293,8 @@ namespace ScriptCanvas
bool m_wasAdded = false;
AZ::Entity* m_buildEntity = nullptr;
};
void ReflectEventTypeOnDemand(const AZ::TypeId& typeId, AZStd::string_view name, AZ::IRttiHelper* rttiHelper = nullptr);
}
namespace AZStd