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

Merge branch 'development' into linux_ar

Browse Source
This commit is contained in:
sweeneys
2021-11-10 16:53:18 -08:00
parent d93ac7d791 9b393d16fe
commit 7e2d3867a8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EditorPythonBindings/Code/Source/PythonLogSymbolsComponent.cpp
+5
View File
@@ -739,6 +739,11 @@ namespace EditorPythonBindings
moduleParts.pop_back();
AzFramework::StringFunc::Append(targetModule, ".pyi");
// create an __init__.py file as the base module path
AZStd::string initModule;
AzFramework::StringFunc::Join(initModule, moduleParts.begin(), moduleParts.end(), '.');
OpenInitFileAt(initModule);
AZStd::string modulePath;
AzFramework::StringFunc::Append(modulePath, m_basePath.c_str());
AzFramework::StringFunc::Append(modulePath, AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING);
Gems/EditorPythonBindings/Code/Source/PythonProxyObject.cpp
+1 -1
View File
@@ -846,7 +846,7 @@ namespace EditorPythonBindings
{
return ConstructPythonProxyObjectByTypename(behaviorClassName, pythonArgs);
});
PythonSymbolEventBus::QueueBroadcast(&PythonSymbolEventBus::Events::LogClassWithName, subModuleName, behaviorClass, properSyntax);
PythonSymbolEventBus::QueueBroadcast(&PythonSymbolEventBus::Events::LogClassWithName, subModuleName, behaviorClass, syntaxName.value());
}
else
{