Browse Source

Fixed nesting of Settings for the AssetProcessor in Templates (#8329)

The templates had the ScanFolder entries under the incorrect key of
"/Amazon/AssetProcessor" instead of "/Amazon/AssetProcessor/Settings".

Signed-off-by: lumberyard-employee-dm <[email protected]>
lumberyard-employee-dm 3 years ago
parent
commit
2b69cc060e

+ 11 - 9
Templates/AssetGem/Template/Registry/assetprocessor_settings.setreg

@@ -1,15 +1,17 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder ${Name}/Assets": {
-                "watch": "@GEMROOT:${Name}@/Assets",
-                "recursive": 1,
-                "order": 101
-            },
-            "ScanFolder ${Name}/Registry": {
-                "watch": "@GEMROOT:${Name}@/Registry",
-                "recursive": 1,
-                "order": 102
+            "Settings": {
+                "ScanFolder ${Name}/Assets": {
+                    "watch": "@GEMROOT:${Name}@/Assets",
+                    "recursive": 1,
+                    "order": 101
+                },
+                "ScanFolder ${Name}/Registry": {
+                    "watch": "@GEMROOT:${Name}@/Registry",
+                    "recursive": 1,
+                    "order": 102
+                }
             }
         }
     }

+ 11 - 9
Templates/CppToolGem/Template/Registry/assetprocessor_settings.setreg

@@ -1,15 +1,17 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder ${Name}/Assets": {
-                "watch": "@GEMROOT:${Name}@/Assets",
-                "recursive": 1,
-                "order": 101
-            },
-            "ScanFolder ${Name}/Registry": {
-                "watch": "@GEMROOT:${Name}@/Registry",
-                "recursive": 1,
-                "order": 102
+            "Settings": {
+                "ScanFolder ${Name}/Assets": {
+                    "watch": "@GEMROOT:${Name}@/Assets",
+                    "recursive": 1,
+                    "order": 101
+                },
+                "ScanFolder ${Name}/Registry": {
+                    "watch": "@GEMROOT:${Name}@/Registry",
+                    "recursive": 1,
+                    "order": 102
+                }
             }
         }
     }

+ 11 - 9
Templates/DefaultGem/Template/Registry/assetprocessor_settings.setreg

@@ -1,15 +1,17 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder ${Name}/Assets": {
-                "watch": "@GEMROOT:${Name}@/Assets",
-                "recursive": 1,
-                "order": 101
-            },
-            "ScanFolder ${Name}/Registry": {
-                "watch": "@GEMROOT:${Name}@/Registry",
-                "recursive": 1,
-                "order": 102
+            "Settings": {
+                "ScanFolder ${Name}/Assets": {
+                    "watch": "@GEMROOT:${Name}@/Assets",
+                    "recursive": 1,
+                    "order": 101
+                },
+                "ScanFolder ${Name}/Registry": {
+                    "watch": "@GEMROOT:${Name}@/Registry",
+                    "recursive": 1,
+                    "order": 102
+                }
             }
         }
     }

+ 11 - 9
Templates/DefaultProject/Template/Gem/Registry/assetprocessor_settings.setreg

@@ -1,15 +1,17 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder ${Name}/Assets": {
-                "watch": "@GEMROOT:${Name}@/Assets",
-                "recursive": 1,
-                "order": 101
-            },
-            "ScanFolder ${Name}/Registry": {
-                "watch": "@GEMROOT:${Name}@/Registry",
-                "recursive": 1,
-                "order": 102
+            "Settings": {
+                "ScanFolder ${Name}/Assets": {
+                    "watch": "@GEMROOT:${Name}@/Assets",
+                    "recursive": 1,
+                    "order": 101
+                },
+                "ScanFolder ${Name}/Registry": {
+                    "watch": "@GEMROOT:${Name}@/Registry",
+                    "recursive": 1,
+                    "order": 102
+                }
             }
         }
     }

+ 16 - 14
Templates/DefaultProject/Template/Registry/assetprocessor_settings.setreg

@@ -1,20 +1,22 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder Project/ShaderLib": {
-                "watch": "@PROJECTROOT@/ShaderLib",
-                "recursive": 1,
-                "order": 1
-            },
-            "ScanFolder Project/Shaders": {
-                "watch": "@PROJECTROOT@/Shaders",
-                "recurisve": 1,
-                "order": 2
-            },
-            "ScanFolder Project/Registry": {
-                "watch": "@PROJECTROOT@/Registry",
-                "recursive": 1,
-                "order": 3
+            "Settings": {
+                "ScanFolder Project/ShaderLib": {
+                    "watch": "@PROJECTROOT@/ShaderLib",
+                    "recursive": 1,
+                    "order": 1
+                },
+                "ScanFolder Project/Shaders": {
+                    "watch": "@PROJECTROOT@/Shaders",
+                    "recurisve": 1,
+                    "order": 2
+                },
+                "ScanFolder Project/Registry": {
+                    "watch": "@PROJECTROOT@/Registry",
+                    "recursive": 1,
+                    "order": 3
+                }
             }
         }
     }

+ 11 - 14
Templates/MinimalProject/Template/Gem/Registry/assetprocessor_settings.setreg

@@ -1,20 +1,17 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder Project/ShaderLib": {
-                "watch": "@PROJECTROOT@/ShaderLib",
-                "recursive": 1,
-                "order": 1
-            },
-            "ScanFolder Project/Shaders": {
-                "watch": "@PROJECTROOT@/Shaders",
-                "recurisve": 1,
-                "order": 2
-            },
-            "ScanFolder Project/Registry": {
-                "watch": "@PROJECTROOT@/Registry",
-                "recursive": 1,
-                "order": 3
+            "Settings": {
+                "ScanFolder ${Name}/Assets": {
+                    "watch": "@GEMROOT:${Name}@/Assets",
+                    "recursive": 1,
+                    "order": 101
+                },
+                "ScanFolder ${Name}/Registry": {
+                    "watch": "@GEMROOT:${Name}@/Registry",
+                    "recursive": 1,
+                    "order": 102
+                }
             }
         }
     }

+ 16 - 14
Templates/MinimalProject/Template/Registry/assetprocessor_settings.setreg

@@ -1,20 +1,22 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder Project/ShaderLib": {
-                "watch": "@PROJECTROOT@/ShaderLib",
-                "recursive": 1,
-                "order": 1
-            },
-            "ScanFolder Project/Shaders": {
-                "watch": "@PROJECTROOT@/Shaders",
-                "recurisve": 1,
-                "order": 2
-            },
-            "ScanFolder Project/Registry": {
-                "watch": "@PROJECTROOT@/Registry",
-                "recursive": 1,
-                "order": 3
+            "Settings": {
+                "ScanFolder Project/ShaderLib": {
+                    "watch": "@PROJECTROOT@/ShaderLib",
+                    "recursive": 1,
+                    "order": 1
+                },
+                "ScanFolder Project/Shaders": {
+                    "watch": "@PROJECTROOT@/Shaders",
+                    "recurisve": 1,
+                    "order": 2
+                },
+                "ScanFolder Project/Registry": {
+                    "watch": "@PROJECTROOT@/Registry",
+                    "recursive": 1,
+                    "order": 3
+                }
             }
         }
     }

+ 11 - 9
Templates/PythonToolGem/Template/Registry/assetprocessor_settings.setreg

@@ -1,15 +1,17 @@
 {
     "Amazon": {
         "AssetProcessor": {
-            "ScanFolder ${Name}/Assets": {
-                "watch": "@GEMROOT:${Name}@/Assets",
-                "recursive": 1,
-                "order": 101
-            },
-            "ScanFolder ${Name}/Registry": {
-                "watch": "@GEMROOT:${Name}@/Registry",
-                "recursive": 1,
-                "order": 102
+            "Settings": {
+                "ScanFolder ${Name}/Assets": {
+                    "watch": "@GEMROOT:${Name}@/Assets",
+                    "recursive": 1,
+                    "order": 101
+                },
+                "ScanFolder ${Name}/Registry": {
+                    "watch": "@GEMROOT:${Name}@/Registry",
+                    "recursive": 1,
+                    "order": 102
+                }
             }
         }
     }