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

Merging upstream

Browse Source 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
This commit is contained in:
Dayo Lawal
2021-08-05 14:20:25 -05:00
parent bf7512ebf4 34afed6792
commit 602da53ebe
598 changed files with 11008 additions and 7322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
+2 -4
View File
@@ -11,7 +11,6 @@
#include <Atom/Document/MaterialDocumentModule.h>
#include <Atom/Document/MaterialDocumentSystemRequestBus.h>
#include <Atom/Viewport/MaterialViewportModule.h>
#include <Atom/Window/MaterialEditorWindowModule.h>
@@ -43,8 +42,8 @@
#include <MaterialEditor_Traits_Platform.h>
AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
#include <QObject>
#include <QMessageBox>
#include <QObject>
AZ_POP_DISABLE_WARNING
namespace MaterialEditor
@@ -52,7 +51,7 @@ namespace MaterialEditor
//! This function returns the build system target name of "MaterialEditor
AZStd::string MaterialEditorApplication::GetBuildTargetName() const
{
#if !defined (LY_CMAKE_TARGET)
#if !defined(LY_CMAKE_TARGET)
#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
#endif
return AZStd::string{ LY_CMAKE_TARGET };
@@ -71,7 +70,6 @@ namespace MaterialEditor
MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv)
: AtomToolsApplication(argc, argv)
{
QApplication::setApplicationName("O3DE Material Editor");
Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
-3
View File
@@ -35,9 +35,6 @@ namespace MaterialEditor
private:
void ProcessCommandLine(const AZ::CommandLine& commandLine) override;
AZStd::string GetBuildTargetName() const override;
//! List of common asset filters for things that need to be compiled to run the material editor
//! Some of these things will not be necessary once we have proper support for queued asset loading and reloading
AZStd::vector<AZStd::string> GetCriticalAssetFilters() const override;
};
} // namespace MaterialEditor
Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
+3 -3
View File
@@ -324,7 +324,7 @@ namespace MaterialEditor
{
if (!preset)
{
AZ_Error("MaterialViewportRenderer", false, "Attempting to set invalid lighting preset.");
AZ_Warning("MaterialViewportRenderer", false, "Attempting to set invalid lighting preset.");
return;
}
@@ -365,13 +365,13 @@ namespace MaterialEditor
{
if (!preset)
{
AZ_Error("MaterialViewportRenderer", false, "Attempting to set invalid model preset.");
AZ_Warning("MaterialViewportRenderer", false, "Attempting to set invalid model preset.");
return;
}
if (!preset->m_modelAsset.GetId().IsValid())
{
AZ_Error("MaterialViewportRenderer", false, "Attempting to set invalid model for preset: '%s'\n.", preset->m_displayName.c_str());
AZ_Warning("MaterialViewportRenderer", false, "Attempting to set invalid model for preset: '%s'\n.", preset->m_displayName.c_str());
return;
}