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

Merged conflicts from pulling down latest development

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/ProjectManager/Source/PythonBindings.cpp
+20 -6
View File
@@ -646,18 +646,32 @@ namespace O3DE::ProjectManager
gemInfo.m_name = Py_To_String(data["gem_name"]);
// optional
gemInfo.m_displayName = Py_To_String_Optional(data, "DisplayName", gemInfo.m_name);
gemInfo.m_summary = Py_To_String_Optional(data, "Summary", "");
gemInfo.m_version = Py_To_String_Optional(data, "Version", "");
gemInfo.m_requirement = Py_To_String_Optional(data, "Requirements", "");
gemInfo.m_displayName = Py_To_String_Optional(data, "display_name", gemInfo.m_name);
gemInfo.m_summary = Py_To_String_Optional(data, "summary", "");
gemInfo.m_version = "";
gemInfo.m_requirement = Py_To_String_Optional(data, "requirements", "");
if (data.contains("Tags"))
if (data.contains("user_tags"))
{
for (auto tag : data["Tags"])
for (auto tag : data["user_tags"])
{
gemInfo.m_features.push_back(Py_To_String(tag));
}
}
QString gemType = Py_To_String_Optional(data, "type", "");
if (gemType == "Asset")
{
gemInfo.m_types |= GemInfo::Type::Asset;
}
if (gemType == "Code")
{
gemInfo.m_types |= GemInfo::Type::Code;
}
if (gemType == "Tool")
{
gemInfo.m_types |= GemInfo::Type::Tool;
}
}
catch ([[maybe_unused]] const std::exception& e)
{