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/RC/ResourceCompiler/CMakeLists.txt
-1
View File
@@ -23,7 +23,6 @@ ly_add_target(
Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
INCLUDE_DIRECTORIES
PUBLIC
PCH
.
..
BUILD_DEPENDENCIES
Code/Tools/RC/ResourceCompiler/ResourceCompiler.cpp
-4
View File
@@ -1284,10 +1284,6 @@ void ResourceCompiler::LogMultiLine(const char* szText)
*pLine++ = *p++;
}
while (*p)
{
;
}
}
//////////////////////////////////////////////////////////////////////////
Code/Tools/RC/ResourceCompiler/ResourceCompiler.rc
+1 -1
View File
@@ -73,7 +73,7 @@ BEGIN
VALUE "FileVersion", "1.1.8.6"
VALUE "InternalName", "ResourceCompiler"
VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
VALUE "LegalTrademarks", "Lumberyard"
VALUE "LegalTrademarks", "Open 3D Engine"
VALUE "OriginalFilename", "rc.exe"
VALUE "ProductName", "Resource Compiler"
VALUE "ProductVersion", "1.1.8.6"
Code/Tools/RC/ResourceCompiler/main.cpp
+1 -1
View File
@@ -408,7 +408,7 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
Config mainConfig;
mainConfig.SetConfigKeyRegistry(&rc);
QSettings settings("HKEY_CURRENT_USER\\Software\\Amazon\\Lumberyard\\Settings", QSettings::NativeFormat);
QSettings settings("HKEY_CURRENT_USER\\Software\\Amazon\\O3DE\\Settings", QSettings::NativeFormat);
bool enableSourceControl = settings.value("RC_EnableSourceControl", true).toBool();
mainConfig.SetKeyValue(eCP_PriorityCmdline, "nosourcecontrol", enableSourceControl ? "0" : "1");
Code/Tools/RC/ResourceCompilerPC/CMakeLists.txt
-1
View File
@@ -23,7 +23,6 @@ ly_add_target(
INCLUDE_DIRECTORIES
PUBLIC
.
PCH
COMPILE_DEFINITIONS
PRIVATE
RESOURCE_COMPILER
Code/Tools/RC/ResourceCompilerScene/Common/MaterialExporter.cpp
+1 -1
View File
@@ -306,7 +306,7 @@ Change FBX Setting's \"Update Materials\" to true or modify the associated mater
if (index == GFxFramework::MaterialExport::g_materialNotFound)
{
AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unable to find material named %s in mtl file while building FBX to Lumberyard material index table.", nodeName.c_str());
AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Unable to find material named %s in mtl file while building FBX to Open 3D Engine material index table.", nodeName.c_str());
result += SceneEvents::ProcessingResult::Failure;
}
table.push_back(index);
Code/Tools/RC/ResourceCompilerXML/CMakeLists.txt
-1
View File
@@ -22,7 +22,6 @@ ly_add_target(
INCLUDE_DIRECTORIES
PRIVATE
.
PCH
BUILD_DEPENDENCIES
PRIVATE
3rdParty::Qt::Core