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

Merge branch 'main' into Atom/dmcdiar/ATOM-15517

Browse Source
This commit is contained in:
Doug McDiarmid
2021-06-02 00:10:55 -07:00
parent 982c30eefd 0f699cfd47
commit 35d7ee5e53
182 changed files with 5870 additions and 2129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceData.h
+1 -1
View File
@@ -32,7 +32,7 @@ namespace AZ
//! In the source data, properties and UV names are loaded separately.
//! However, treating UV names as a special property group can greatly simplify the editor code.
//! See MaterialInspector::AddUvNamesGroup() for more details.
static constexpr const char UvGroupName[] = "UvNames";
static constexpr const char UvGroupName[] = "uvSets";
class MaterialAsset;
Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Base.h
+3
View File
@@ -59,7 +59,10 @@ namespace AZ
static constexpr uint32_t Draw = 0;
static constexpr uint32_t Object = 1;
static constexpr uint32_t Material = 2;
static constexpr uint32_t SubPass = 3;
static constexpr uint32_t Pass = 4;
static constexpr uint32_t View = 5;
static constexpr uint32_t Scene = 6;
};
}
}