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

fixing build

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-05 14:30:04 -07:00
parent aa12434728
commit 0dc829891a
5 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp
+1 -6
View File
@@ -18,11 +18,6 @@ namespace AZ
{
namespace DataTypes = AZ::SceneAPI::DataTypes;
const AZStd::fixed_string<8> MaterialData::s_DiffuseMapName = "Diffuse";
const AZStd::fixed_string<9> MaterialData::s_SpecularMapName = "Specular";
const AZStd::fixed_string<5> MaterialData::s_BumpMapName = "Bump";
const AZStd::fixed_string<1> MaterialData::s_emptyString = "";
MaterialData::MaterialData()
: m_isNoDraw(false)
, m_diffuseColor(AZ::Vector3::CreateOne())
@@ -72,7 +67,7 @@ namespace AZ
return result->second;
}
return s_emptyString;
return m_emptyString;
}
void MaterialData::SetNoDraw(bool isNoDraw)
Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h
+2 -4
View File
@@ -11,6 +11,7 @@
#include <SceneAPI/SceneData/SceneDataConfiguration.h>
#include <SceneAPI/SceneCore/DataTypes/GraphData/IMaterialData.h>
#include <AzCore/std/containers/unordered_map.h>
#include <AzCore/std/string/fixed_string.h>
namespace AZ
{
@@ -96,10 +97,7 @@ namespace AZ
bool m_isNoDraw;
const static AZStd::fixed_string<8> s_DiffuseMapName;
const static AZStd::fixed_string<9> s_SpecularMapName;
const static AZStd::fixed_string<5> s_BumpMapName;
const static AZStd::fixed_string<1> s_emptyString;
const AZStd::string m_emptyString;
// A unique id which is used to identify a material in a fbx.
// This is the same as the ID in the fbx file's FbxNode