Make "kind" a disallowed field for metadata in schemas.

(Internal change: 2297901)
PixarAnimationStudios · Oct 26, 2023 · 8bef6d2 · 8bef6d2
1 parent f7cfdb1
commit 8bef6d2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/pxr/usd/usd/schemaRegistry.cpp b/pxr/usd/usd/schemaRegistry.cpp
@@ -1634,6 +1634,10 @@ UsdSchemaRegistry::IsDisallowedField(const TfToken &fieldName)
         const std::vector<TfToken> clipFields = UsdGetClipRelatedFields();
         disallowedFields->insert(clipFields.begin(), clipFields.end());
 
+        // Disallow fallback values for prim "kind" metadata as prim composition
+        // currently intentionally ignores the "kind" fallback value
+        disallowedFields->insert(SdfFieldKeys->Kind);
+
         return disallowedFields;
     }();
 

diff --git a/pxr/usd/usd/testenv/testUsdSchemaGen/schemaFail23.usda b/pxr/usd/usd/testenv/testUsdSchemaGen/schemaFail23.usda
@@ -0,0 +1,26 @@
+#usda 1.0
+(
+    "This file is a contrived schema file."
+    subLayers = [
+        @baseSchema.usda@
+    ]
+)
+
+over "GLOBAL" (
+    customData = {
+        string libraryName = "usdContrived"
+        string libraryPath = "pxr/usd/usdContrived"
+    }
+)
+{
+}
+
+class "DisallowedFieldKind" (
+    inherits = </Typed> 
+    kind = "component"
+    customData = {
+        string className = "DisallowedFieldKind"
+    }
+)
+{
+}