Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -212,7 +212,7 @@ TEST_F(CGFBuilderTest, CGF_MaterialInSameFolder)
 }

 // In this case, we load a basic CGF where the material path is absolute from the dev/ folder,
-// for example "samplesproject/materials/test.mtl".
+// for example "automatedtesting/materials/test.mtl".
 TEST_F(CGFBuilderTest, CGF_MaterialInDifferentFolder)
 {
    AZStd::string cgfName = "gs_block.cgf";