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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/Material/Material.h
+4 -4
View File
@@ -304,10 +304,10 @@ private:
int m_propagationFlags;
//! Material Used in level.
int m_bDummyMaterial : 1; // Dummy material, name specified but material file not found.
int m_bIgnoreNotifyChange : 1; // Do not send notifications about changes.
int m_bRegetPublicParams : 1;
int m_bKeepPublicParamsValues : 1;
unsigned int m_bDummyMaterial : 1; // Dummy material, name specified but material file not found.
unsigned int m_bIgnoreNotifyChange : 1; // Do not send notifications about changes.
unsigned int m_bRegetPublicParams : 1;
unsigned int m_bKeepPublicParamsValues : 1;
bool m_allowLayerActivation;
};