Skip to content

Align KHR_materials_variants schemas with the core spec #1881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
donmccurdy merged 1 commit into from
Oct 17, 2020
Merged

Align KHR_materials_variants schemas with the core spec #1881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions extensions/2.0/Khronos/KHR_materials_variants/schema/glTF.KHR_materials_variants.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"type": "array",
"items": {
"type": "object",
"allOf": [ { "$ref": "glTFChildOfRootProperty.schema.json" } ],
"description": "An object defining a valid material variant",
"gltf_detailedDescription": "An object defining a valid material variant",
"properties": {
Expand All @@ -19,11 +20,15 @@
},
"extras": {
"type": "object"
}
},
"extensions": { }
},
"required": [ "name" ]
}
}
},
"minItems": 1
},
"extensions": { },
"extras": { }
},
"required": [ "variants" ]
}
8 changes: 6 additions & 2 deletions ...0/Khronos/KHR_materials_variants/schema/mesh.primitive.KHR_materials_variants.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"gltf_detailedDescription": "An array of object values that associate an indexed material to a set of variants.",
"items": {
"type": "object",
"allOf": [ { "$ref": "glTFProperty.schema.json" } ],
"properties": {
"variants": {
"uniqueItems": true,
Expand Down Expand Up @@ -37,8 +38,11 @@
"extensions": { }
},
"required": [ "variants", "material" ]
}
}
},
"minItems": 1
},
"extensions": { },
"extras": { }
},
"required": [ "mappings" ]
}