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

merged main window changes

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-10-05 14:50:26 -07:00
parent ac836da605 84f28033a0
commit b2dc9aa666
273 changed files with 2423 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ExecutionLogAsset.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ namespace ScriptCanvas
const char* ExecutionLogAsset::GetDefaultDirectoryRoot()
{
return AZ::IO::FileIOBase::GetInstance()->GetAlias("@devroot@");
return AZ::IO::FileIOBase::GetInstance()->GetAlias("@engroot@");
}
ExecutionLogAsset::ExecutionLogAsset(const AZ::Data::AssetId& assetId, AZ::Data::AssetData::AssetStatus status)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
+2 -2
View File
@@ -36,7 +36,7 @@ namespace ScriptCanvas
azrtti_typeid<RuntimeAsset>(),
"Script Canvas Runtime",
"Script Canvas Runtime Graph",
"@devassets@/scriptcanvas",
"@projectroot@/scriptcanvas",
".scriptcanvas_compiled",
"Script Canvas Runtime",
"Untitled-%i",
@@ -177,7 +177,7 @@ namespace ScriptCanvas
azrtti_typeid<SubgraphInterfaceAsset>(),
"Script Canvas Function Interface",
"Script Canvas Function Interface",
"@devassets@/scriptcanvas",
"@projectroot@/scriptcanvas",
".scriptcanvas_fn_compiled",
"Script Canvas Function Interface",
"Untitled-Function-%i",