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

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvasTesting/Code/CMakeLists.txt
+4 -1
View File
@@ -49,7 +49,8 @@ ly_add_target(
)
ly_add_target(
NAME ScriptCanvasTesting.Editor MODULE
NAME ScriptCanvasTesting.Editor GEM_MODULE
NAMESPACE Gem
FILES_CMAKE
scriptcanvastestingeditor_shared_files.cmake
@@ -69,6 +70,8 @@ ly_add_target(
AZ::AzCore
AZ::AzFramework
AZ::AzToolsFramework
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas.Editor
)
################################################################################
Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
+2 -2
View File
@@ -74,9 +74,9 @@ namespace ScriptCanvasTests
descriptor.m_useExistingAllocator = true;
AZ::DynamicModuleDescriptor dynamicModuleDescriptor;
dynamicModuleDescriptor.m_dynamicLibraryPath = "Gem.GraphCanvas.Editor.875b6fcbdeea44deaae7984ad9bb6cdc.v0.1.0";
dynamicModuleDescriptor.m_dynamicLibraryPath = "GraphCanvas.Editor";
descriptor.m_modules.push_back(dynamicModuleDescriptor);
dynamicModuleDescriptor.m_dynamicLibraryPath = "Gem.ScriptCanvasGem.Editor.869a0d0ec11a45c299917d45c81555e6.v0.1.0";
dynamicModuleDescriptor.m_dynamicLibraryPath = "ScriptCanvas.Editor";
descriptor.m_modules.push_back(dynamicModuleDescriptor);
dynamicModuleDescriptor.m_dynamicLibraryPath = "Gem.ExpressionEvaluation.4c6f9df57ca2468f93c8d860ee6a1167.v0.1.0";
descriptor.m_modules.push_back(dynamicModuleDescriptor);