Integrating latest from github/staging

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
+4 -2
View File
@@ -31,9 +31,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::GraphCanvasWidgets
)
ly_add_target(
NAME GraphModel.Editor MODULE
NAME GraphModel.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Gem.GraphModel.Editor.0844f64a3acf4f5abf3a535dc9b63bc9.v0.1.0
FILES_CMAKE
graphmodel_editor_files.cmake
COMPILE_DEFINITIONS
@@ -49,6 +49,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
AZ::AzToolsFramework
Gem::GraphCanvasWidgets
Gem::GraphModel.Editor.Static
RUNTIME_DEPENDENCIES
Gem::GraphCanvas.Editor
)
endif()