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

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor.rc
+1 -1
View File
@@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "../../native/ui/style/lyassetprocessor.ico"
IDI_ICON1 ICON DISCARDABLE "../../native/ui/style/o3de_assetprocessor.ico"
Code/Tools/AssetProcessor/Platform/Windows/AssetProcessorBatch.ico
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c05ee28bfca3a0411afd13fb2b5fcecd5ca9b5e74627e5f6837d3c9cea25b715
size 107497
Code/Tools/AssetProcessor/Platform/Windows/AssetProcessorBatch.rc
+1
View File
@@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "AssetProcessorBatch.ico"
Code/Tools/AssetProcessor/Platform/Windows/AssetProcessor_Traits_Windows.h
+2 -2
View File
@@ -11,5 +11,5 @@
*/
#pragma once
#define ASSETPROCESSOR_TRAIT_LEGACY_RC_RELATIVE_PATH "/rc.exe"
#define ASSETPROCESSOR_TRAIT_CASE_SENSITIVE_FILESYSTEM false
#define ASSETPROCESSOR_TRAIT_LEGACY_RC_RELATIVE_PATH "rc.exe"
#define ASSETPROCESSOR_TRAIT_CASE_SENSITIVE_FILESYSTEM false