Merge pull request #102 from ux3d/fix/sample_models_merge · KhronosGroup/glTF-Sample-Viewer@3b15ed2

Commit

Merge pull request #102 from ux3d/fix/sample_models_merge

fixed merge in sample models repo

UX3D-hohenester authored Jan 27, 2021

2 parents f159f4d + f31445b commit 3b15ed2

+21 −0		2.0/Box With Spaces/README.md
+ −		2.0/Box With Spaces/glTF/Box With Spaces.bin
+154 −0		2.0/Box With Spaces/glTF/Box With Spaces.gltf
+ −		2.0/Box With Spaces/glTF/Normal Map.png
+ −		2.0/Box With Spaces/glTF/Roughness Metallic.png
+ −		2.0/Box With Spaces/glTF/glTF Logo With Spaces.png
+ −		2.0/Box With Spaces/screenshot/screenshot.png
+ −		2.0/Box With Spaces/screenshot/screenshot_large.png
+1 −0		2.0/README.md
+2 −0		2.0/ToyCar/README.md
+ −		2.0/ToyCar/gltf/Fabric_baseColor.png
+ −		2.0/ToyCar/gltf/Fabric_normal.png
+ −		2.0/ToyCar/gltf/Fabric_occlusion.png
+ −		2.0/ToyCar/gltf/ToyCar.bin
+0 −709		2.0/ToyCar/gltf/ToyCar.gltf
+ −		2.0/ToyCar/gltf/ToyCar_basecolor.png
+ −		2.0/ToyCar/gltf/ToyCar_clearcoat.png
+ −		2.0/ToyCar/gltf/ToyCar_emissive.png
+ −		2.0/ToyCar/gltf/ToyCar_normal.png
+ −		2.0/ToyCar/gltf/ToyCar_occlusion_roughness_metallic.png
+15 −12		2.0/model-index.json