Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -1,12 +1,12 @@
 {
    "gem_name": "PBSreferenceMaterials",
-    "GemFormatVersion": 3,
-    "Uuid": "07375b61b1a2424bb03088bbdf28b2c8",
-    "Name": "PBSreferenceMaterials",
-    "DisplayName": "PBSreferenceMaterials",
-    "Version": "0.1.0",
-    "LinkType": "NoCode",
-    "Summary": "A set of Physically Based Shading reference materials and texture assets",
-    "Tags": ["Asset"],
-    "IconPath": "preview.png"
+    "display_name": "PBS Reference Materials",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Asset",
+    "summary": "The PBS Reference Materials Gem provides physically based reference materials for Open 3D Engine.",
+    "canonical_tags": ["Gem"],
+    "user_tags": ["Rendering", "Sample", "Assets"],
+    "icon_path": "preview.png",
+    "requirements": ""
 }