Merge remote-tracking branch 'upstream/main' into DisableAtomShim

2021-04-23 18:35:18 -05:00
parent f750a491c8 4abe63e046
commit bc40dd7e5e
4379 changed files with 30092 additions and 39185 deletions
@@ -12,4 +12,4 @@ ly_add_source_properties(
    SOURCES MainWindow.cpp CryEdit.cpp
    PROPERTY COMPILE_OPTIONS
    VALUES -bigobj
-)
+)
@@ -65,4 +65,4 @@
    "version" : 1,
    "author" : "xcode"
  }
-}
+}
@@ -3,4 +3,4 @@
    "version" : 1,
    "author" : "xcode"
  }
-}
+}
@@ -65,4 +65,4 @@
    "version" : 1,
    "author" : "xcode"
  }
-}
+}
@@ -22,4 +22,4 @@ set_target_properties(Editor PROPERTIES
    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/gui_info.plist
    RESOURCE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets
    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME EditorAppIcon
-)
+)