Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
8b646cb
fix: empty or invalid root transforms should not be exported
hybridherbst May 7, 2024
d6416be
fix: when no root transforms are exported, no scene should be created…
hybridherbst May 7, 2024
d1ffc44
fix 737 - wrong image filenames- was ignoring extension and wrong fil…
robertdorn83 May 14, 2024
0e85b0f
removed loaded node count error log - in some cases (e.g. LODs) there…
robertdorn83 May 14, 2024
01eef04
removed loaded texture count error log - when multiple samplers are u…
robertdorn83 May 14, 2024
dafcf1f
set legacy animation import mode
hybridherbst May 29, 2024
0a500e8
Merge remote-tracking branch 'origin/fix/wrong-texture-filename-expor…
hybridherbst Jun 14, 2024
66f72b1
Merge remote-tracking branch 'origin/fix/removed-error-logs' into dev
hybridherbst Jun 14, 2024
dcacd83
fixes #740 - added missing ExtTransform for some textures in animatio…
robertdorn83 Jul 5, 2024
6d8ff3e
fixes #746 - added uv-starts-at-top check - based on unity docs
robertdorn83 Jul 11, 2024
378f17f
exposed texture readwrite enabled and generate mipmaps option to impo…
robertdorn83 Jul 11, 2024
d64d755
fixes #752 - added missing generate mitmaps to ktx texture load
robertdorn83 Jul 11, 2024
ebc6ea4
fixes #751 - also add bone when name is already correct
robertdorn83 Jul 11, 2024
495e557
added missing using system for uwp target - fixes #757
robertdorn83 Jul 16, 2024
8102a7a
Merge remote-tracking branch 'origin/animation-pointer-exttransform-f…
hybridherbst Jul 23, 2024
8b7f30d
Merge remote-tracking branch 'khronos/fix/cameraopaquetexture-uv-flip…
hybridherbst Jul 23, 2024
0b9d9b5
Merge remote-tracking branch 'khronos/feature/more-texture-import-opt…
hybridherbst Jul 23, 2024
af78321
Merge remote-tracking branch 'khronos/fix/avatar-bone-mapping-with-al…
hybridherbst Jul 23, 2024
731ddd1
feat: allow importing non-standard VEC3 and VEC4 TEXCOORD_n data and …
hybridherbst Jul 23, 2024
7813092
changelog/version
hybridherbst Jul 23, 2024
04de8ec
feat: allow flipping humanoid rig root bone for VRM-style humanoid ri…
hybridherbst Aug 14, 2024
4bfef28
output throwed execption to log instead of hiding it
robertdorn83 Aug 27, 2024
a79bd75
fixed wrong callback subscription EditorApplication.update > delayCall
robertdorn83 Sep 4, 2024
100e6f6
readme update: blend shape known issue rephrased for more clarity
robertdorn83 Sep 4, 2024
4ca9035
readme update: added animation pointer import support
robertdorn83 Sep 5, 2024
3c38a98
readme update: removed known issue with MAOS maps, is fixed
robertdorn83 Sep 4, 2024
0665439
added Asset.ToString methods, added gltf.Asset string to importer and…
robertdorn83 Sep 4, 2024
e610bc2
added mesh deduplication on import
robertdorn83 Aug 28, 2024
fcdbc47
deduplication fix of meshes with different weights
robertdorn83 Aug 29, 2024
e6d92f5
add texture deduplication on import
robertdorn83 Aug 29, 2024
9f99aa8
extracted UnityMeshData from SceneImporter
robertdorn83 Aug 29, 2024
53c4121
code formatting
robertdorn83 Aug 29, 2024
8fe7bc5
made ShaderOverride public on GLTFComponent
robertdorn83 Aug 27, 2024
41a6b8e
added simplified sheen function to PBRHelpers
robertdorn83 Sep 3, 2024
6ee1446
added Sheen to pbrGraph
robertdorn83 Sep 3, 2024
d0d451f
added sheen extension into codebase
robertdorn83 Sep 3, 2024
406cfb9
added pbrGraph GUI property visibility for Sheen and Dispersion
robertdorn83 Sep 4, 2024
09391cd
changed Sheen to node based to support MaterialX
robertdorn83 Sep 5, 2024
f1f31eb
added AnimationCacheData to RefCountedCacheData script
robertdorn83 Aug 27, 2024
3446304
changed unity version compiler define for particle bakemesh
robertdorn83 Sep 12, 2024
dc6fa9d
Sheen: removed getmainlight (not working on all RPs)
robertdorn83 Sep 13, 2024
8325abc
adds warning when UV0 and UV1 have dimension >= 2 as glTF can't offic…
hybridherbst Sep 13, 2024
615ab67
added new SceneImporter constructor variant without gltfroot parameter
robertdorn83 Sep 16, 2024
4675d12
added warning when dataloader and gltf filename is missing on import
robertdorn83 Sep 16, 2024
dcf4dc4
Create bug.yml
marwie Sep 16, 2024
0bb8b62
added summary with example to GLTFSceneImporter constructor
robertdorn83 Sep 17, 2024
604658e
pbr shadergraph > changes to share sampler states to avoid max ps_4_0…
robertdorn83 Sep 19, 2024
e20fd5a
adjust issue template
hybridherbst Sep 20, 2024
68f4321
output throwed execption to log instead of hiding it
robertdorn83 Aug 27, 2024
dd8a317
fixed wrong callback subscription EditorApplication.update > delayCall
robertdorn83 Sep 4, 2024
2c7c5df
readme update: blend shape known issue rephrased for more clarity
robertdorn83 Sep 4, 2024
c28499c
readme update: added animation pointer import support
robertdorn83 Sep 5, 2024
5b1b7ad
readme update: removed known issue with MAOS maps, is fixed
robertdorn83 Sep 4, 2024
861ae3e
changed unity version compiler define for particle bakemesh
robertdorn83 Sep 12, 2024
cba4272
Merge branch 'feature/flip-humanoid-root-bone' into dev
hybridherbst Sep 20, 2024
abef38c
Merge remote-tracking branch 'khronos/enhancement/show-asset-infos-in…
hybridherbst Sep 20, 2024
3953de6
Merge remote-tracking branch 'khronos/enhancement/gltfcomponent-shade…
hybridherbst Sep 20, 2024
0043492
Merge remote-tracking branch 'khronos/fix/missing-cleanup-of-animatio…
hybridherbst Sep 20, 2024
6baabc3
Merge remote-tracking branch 'khronos/fix/load-from-stream' into dev
hybridherbst Sep 20, 2024
de0aeed
Merge remote-tracking branch 'khronos/features/sheen' into dev
hybridherbst Sep 20, 2024
5384213
Merge branch 'feature/resourcededuplication' into dev
hybridherbst Sep 20, 2024
e5091c1
Merge branch 'feature/warn-on-multichannel-uv2-export' into dev
hybridherbst Sep 20, 2024
c05338e
fixes 782 - method not found in webgl build
robertdorn83 Sep 20, 2024
472bcd1
fix a number of potential NullReferenceExceptions
hybridherbst Sep 20, 2024
b53e86e
clean up extensions inspector a bit
hybridherbst Sep 20, 2024
9909208
added prebuilded gltf pbrgraph and unlitgraph variant collection
robertdorn83 Sep 20, 2024
86c6ee8
clean up variant collection folders
hybridherbst Sep 20, 2024
ccffe2b
Merge remote-tracking branch 'khronos/fix/canvas-export' into dev
hybridherbst Sep 20, 2024
f8d9248
fix(Exporter): Fixed invalid texture hash
Vaso64 Jun 27, 2024
ee956ac
improve null check and readability
hybridherbst Sep 20, 2024
1916b83
Merge remote-tracking branch 'khronos/enhancement/prebuilded-shader-v…
hybridherbst Sep 20, 2024
72cd2f7
check for missing primitives on mesh import
hybridherbst Sep 20, 2024
550bc9e
fixed gltfplugin serialization of enabled bool
robertdorn83 Sep 24, 2024
093ecba
added missing shader error output for TMP export
robertdorn83 Sep 24, 2024
a758a32
TMPExport: refactored and removed tempMat to be independent from exis…
robertdorn83 Sep 24, 2024
05700ae
added hideininspector to enabled in gltfplugin
robertdorn83 Sep 24, 2024
a8d8036
CanvasExport: replaced legacy UnlitGraph-Transparent shader to UnlitG…
robertdorn83 Sep 24, 2024
5fa5d95
fixed typo
robertdorn83 Sep 25, 2024
1d3dec5
added shaderpassstripping
robertdorn83 Sep 20, 2024
0f8954a
fix: ensure materials created with Create > UnityGLTF > Material use …
hybridherbst Sep 26, 2024
ba058cc
CanvasExport: fixed not rebuilded graphic mesh
robertdorn83 Sep 26, 2024
3908ccb
wip material libraries
hybridherbst Sep 26, 2024
54ab4b0
Merge remote-tracking branch 'khronos/fix/canvas-export' into dev
hybridherbst Sep 26, 2024
d6099cb
naming and formatting cleanup
hybridherbst Sep 26, 2024
828e698
Merge branch 'feature/shaderpassstripping' into dev
hybridherbst Sep 26, 2024
d6e4fcc
Merge branch 'feature/material-libraries' into dev
hybridherbst Sep 26, 2024
5ea6e30
fix: null checks when constructing texture from stream
hybridherbst Sep 26, 2024
159c8ad
fix regression in glTF + bin + images import
hybridherbst Sep 26, 2024
5877c70
feat: ability to export selected resources as glTF without scene
hybridherbst Sep 26, 2024
8f6293d
PbrGraphGUI: commented out VERTEX_COLOR keyword check > currently not…
robertdorn83 Sep 27, 2024
5f94f2b
changelog/version
hybridherbst Oct 6, 2024
39fef1b
fix nullref with asset info when there's actually no asset info
hybridherbst Oct 6, 2024
5c7f616
fix: ParticleSystemBakeMeshOptions was only introduced in 2022.3.11f1
hybridherbst Oct 14, 2024
b81d3dd
VisionOS: set volume and transmission materials to AlphaMode.Blend
robertdorn83 Sep 5, 2024
aebb4f0
added materialX branches to pbrgraph shader
robertdorn83 Oct 17, 2024
8a23140
fix: prevent incorrect warning when meshes don't have UV1/UV2 attributes
hybridherbst Oct 28, 2024
74f54e1
fix: Don't call export multiple times from context menu for multi-sel…
hybridherbst Oct 28, 2024
6c56024
fix: clean up unused property in `GLTFComponent`
hybridherbst Oct 28, 2024
b99d85f
changelog, version
hybridherbst Oct 28, 2024
b2853b3
added new runtime texture compression option, exposed import setting …
robertdorn83 Oct 23, 2024
d98a676
fix: assets with absolute URLs or paths that contain URL encoded info…
hybridherbst Nov 25, 2024
c7b6763
fixed 808 - Check all sub Meshes of used attributes instead only the …
robertdorn83 Feb 5, 2025
8fc79ec
added in scene loader a Task.Yield() to ensure the progress callback …
robertdorn83 Feb 5, 2025
8eb9268
added RoughRefractionFeature Unity 6 support
robertdorn83 Feb 5, 2025
dcf7e9b
added UnityGltf Package Version, Unity Version and current Render Pip…
robertdorn83 Feb 18, 2025
c118ba0
fix nullref when plugin is not loaded/defined
hybridherbst Mar 4, 2025
a5a70f4
removed unity internal method invocation for current platform name
robertdorn83 Mar 4, 2025
372c0f4
added KHR_visibility schema
robertdorn83 Nov 12, 2024
b97d921
added visibility plugins
robertdorn83 Nov 12, 2024
9eb4f56
added visibility check on node import
robertdorn83 Nov 12, 2024
7f33447
added KHR_node_selectability schema
robertdorn83 Nov 12, 2024
a152530
renamed KHR_visibility to KHR_node_visibility
robertdorn83 Nov 12, 2024
2783d8d
added missing serialization of visible and selectable
robertdorn83 Nov 13, 2024
7d7661c
missing commit of renaming KHR_visibilty to KHR_node_visibility
robertdorn83 Nov 13, 2024
796c523
added visibility extension to export
robertdorn83 Nov 13, 2024
077f8a9
fixed importer issues for invisible objects when using KHR_node_visib…
robertdorn83 Nov 13, 2024
33ab0c9
fixed typo
robertdorn83 Nov 13, 2024
b87f667
added hoverability extension
robertdorn83 Dec 4, 2024
46d9af1
fixed wrong extension name for visibility extension plugin
robertdorn83 Dec 5, 2024
dfbbdbc
exposed plugins from exporter
robertdorn83 Feb 6, 2025
9708cb6
fixed typo
robertdorn83 Mar 5, 2025
15790db
PBRGraph Shader: clamped Sheen Rougness to 0..1
robertdorn83 Mar 6, 2025
ba4f4e1
Merge remote-tracking branch 'khronos/enhancement/detailedgeneratorin…
hybridherbst Mar 6, 2025
85da6b9
Merge remote-tracking branch 'khronos/enhancement/exposed-runtime-imp…
hybridherbst Mar 6, 2025
f764aa9
Merge remote-tracking branch 'khronos/enhancement/visionos-support' i…
hybridherbst Mar 6, 2025
af4a386
Merge remote-tracking branch 'khronos/fix/primitives-with-different-a…
hybridherbst Mar 6, 2025
6f990fb
cleanup: pass selected build target into TextureImporterHelper
hybridherbst Mar 6, 2025
1e7096f
add shader dependencies to importer to work around some edge cases a…
hybridherbst Mar 6, 2025
da60989
changelog/version
hybridherbst Mar 6, 2025
72b35df
updated readme: added runtime loading code snippets, runtime shader i…
robertdorn83 Mar 6, 2025
e6ccad1
added GLTFComponent screenshot
robertdorn83 Mar 6, 2025
a401ac0
changed screenshot size
robertdorn83 Mar 6, 2025
f2e443a
renamed AppendStreamingassets to LoadFromStreamingAssets, inclusive c…
robertdorn83 Mar 6, 2025
44247bf
Merge remote-tracking branch 'khronos/extensions/interactivity-prepar…
hybridherbst Mar 6, 2025
58968ca
changelog
hybridherbst Mar 6, 2025
e0e086f
Add plugin hook for ShouldNodeExport
andybak Jun 18, 2024
4efc65c
added KHR_node_visibility to Import/Export section in readme
robertdorn83 Mar 7, 2025
e15a1f7
deprecated unity api changes in GraphicsSettings
robertdorn83 Mar 7, 2025
f978289
added code snippet for custom Plugins to readme, and added warning fo…
robertdorn83 Mar 7, 2025
15edff9
Merge branch 'feature/should-node-export-hook' into KrhonosDev
robertdorn83 Mar 7, 2025
908a449
removed Unity 2020.x from ReadMe, and added in legacy section which U…
robertdorn83 Mar 7, 2025
f958bf7
readme updates, changelog
hybridherbst Mar 10, 2025
e24df82
Merge branch 'main' into khronos-main
wschnepp Mar 13, 2025
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
119 changes: 119 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
name: 🐞 Bug Report
description: File a technical issue, import or export problem, API issue
labels: ["untriaged"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report. The more info you add, the higher the chance that we'll be able to help! 🙏

- type: textarea
id: bug-description
attributes:
label: Describe the bug 💬
description: A clear and concise description of what the bug is. Thanks!
placeholder: I am doing... What I expect to happen is... What's actually happening is ...
validations:
required: true

- type: textarea
id: reproduction-steps
attributes:
label: Steps to reproduce 🔢
description: Please provide step-by-step instructions for how to see the issue you're describing with the files you provide.
placeholder: |
1. Download the attached reproduction file
2. Drop it into Unity <insert version>
3. See <specific error> in console
validations:
required: true

- type: textarea
id: reproduction
attributes:
label: Files to reproduce the issue ♻
description: Please drop necessary files to reproduce the problem you ran into as `.zip` file or paste a link to a `.gltf/.glb`. A [minimal reproduction](https://stackoverflow.com/help/minimal-reproducible-example) is best ([Why?](https://antfu.me/posts/why-reproductions-are-required)).
placeholder: Reproduction files or URL
validations:
required: false

- type: dropdown
id: version
attributes:
label: Editor Version 🎲
description: Which Unity version are you using? Please note that while we try to support the latest Unity versions, officially only LTS versions are supported.
options:
- 2020.3 or older
- 2021.3
- 2022.3
- 6000.0
- Other (Provide details below)
default: 1
validations:
required: true

- type: input
id: renderpipeline
attributes:
label: Render Pipeline and version
placeholder: URP 10.0.0 / HDRP 10.0.0 / Built-In Render Pipeline
validations:
required: true

- type: input
id: unitygltf
attributes:
label: UnityGLTF Version
placeholder: 2.13.0
validations:
required: true

- type: dropdown
id: OS
attributes:
label: Operating System 👩‍💻
description: Which operating system are you using / on which operating system did you observe the issue?
multiple: true
options:
- Windows
- macOS
- Linux
- iOS
- Android
- WebGL
- VisionOS
- Other (Provide details below)
validations:
required: true

- type: checkboxes
attributes:
label: When does this problem happen?
description: Does this issue happen in the Unity Editor (e.g. when importing assets to your project) or at runtime (e.g. when loading assets in your build)
options:
- label: Editor Import
- label: Runtime Import
- label: Editor Export
- label: Runtime Export
validations:
required: true

- type: textarea
id: project-info
attributes:
label: Additional Info 📜
description: |
Provide additional information that might be useful to understand your use case.

- type: checkboxes
id: checkboxes
attributes:
label: Validations 🩹
description: Before submitting the issue, please make sure you do the following
options:
- label: "I have [searched existing issues](https://github.com/KhronosGroup/UnityGLTF/issues): no issue already exist that reports the same problem."
required: true
- label: I follow the [Code of Conduct](https://www.khronos.org/about/code-of-conduct)
required: true
- label: I provided a [minimal reproducible example](https://stackoverflow.com/help/minimal-reproducible-example), including files when necessary.
required: false
79 changes: 79 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,85 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.15.0] - 2025-03-06

- fix: assets with absolute URLs or paths containing URL encoded information now load correctly
- fix: improve shader dependencies in editor importer to work around some edge cases at first library import
- fix: check all sub-meshes of used attributes instead of only the first one when creating attribute arrays
- fix: ensure progress callback is triggered before `onLoadComplete` in scene loader
- fix: prevent null reference exception when plugin is not loaded/defined
- fix: work around API change in Unity 6000.0.38f1 that caused compilation error
- fix: clamped `Sheen Roughness` to 0..1 range in PBRGraph shader
- fix: `RoughRefractionFeature` now supports Unity 6 and new Render Graph API
- fix: set volume and transmission materials to `AlphaMode.BLEND` on VisionOS to ensure proper rendering
- fix: update render pipeline-related methods for Unity 6000.0+
- change: mark package as compatible with Unity 2021.3+. Legacy support for 2020 and earlier will be removed in future updates.
- change: renamed `GLTFComponent` setting `AppendStreamingAssets` to `LoadFromStreamingAssetsFolder`
- add: MaterialX branches to `UnityGLTF/PBRGraph` shader with conditional compilation for VisionOS
- add: `MaterialXColor` and `MaterialXFloat` shadersubgraphs for platform-specific material settings
- add: new runtime texture compression option (`None`, `LowQuality`, `HighQuality`) to improve runtime memory usage
- add: exposed import settings to keep CPU copy of mesh/textures to `GLTFComponent`
- add: include UnityGLTF package version, Unity version and current render pipeline in `assets.extras` on export
- add: better code snippets for the readme
- add: export plugin hook for `ShouldNodeExport` (https://github.com/KhronosGroup/UnityGLTF/pull/767)
- add: [`KHR_node_visibility`](https://github.com/KhronosGroup/glTF/pull/2410) import and export support, currently disabled by default. Enable in `UnityGLTFSettings`. This is a preparative step for `KHR_interactivity`, which will be added in a later release. Please note that this extension is not yet ratified and implementation details may change.
- add: schema and serialization support for [`KHR_node_hoverability`](https://github.com/KhronosGroup/glTF/pull/2426) and [`KHR_node_selectability`](https://github.com/KhronosGroup/glTF/pull/2422). Please note that these extensions are not yet ratified and implementation details may change.

## [2.14.1] - 2024-10-28

- fix: compiler error with `ParticleSystemBakeMeshOptions` before 2022.3.11f1 since that's where the API was introduced
- fix: prevent incorrect warning when meshes don't have UV1/UV2 attributes
- fix: don't call export multiple times from context menu for multi-selections
- fix: remove unused property from `GLTFComponent`

## [2.14.0] - 2024-10-06

- fix: potential NullReferenceExceptions when importing material-only, mesh-only or texture-only glTF files
- fix: check for missing primitives on mesh import instead of throwing
- fix: GLTFSceneImporter reference counting properly tracks Animation data now
- fix: incorrect callback subscription in glTF Material editing
- fix: CanvasExport plugin was not working correctly in WebGL builds
- fix: rare case of incorrect texture export with invalid texture content hash (thanks @Vaso64)
- fix: ensure materials created with Create > UnityGLTF > Material use UnityGLTF as importer instead of glTFast
- fix: Canvas export plugin was not correctly updating the canvas mesh in builds
- fix: Particle Bake export plugin was not working correctly in 2022.3
- fix: Import/Export plugin enabled/disabled state was not correctly serialized in some cases
- fix: TMPro export plugin uses UnityGLTF shaders for export now instead of adding another dependency
- fix: GLTFSceneImporter can be called without external data loader, but will warn that external data will not be loaded. Previously, a data loader had to be added even when it was not needed.
- change: log warning when exporting UV0 and UV1 with more than 2 components, as glTF only supports 2-component UVs
- change: simplify sampler usage in PBRGraph where possible to prevent warnings in later Unity versions
- change: simplify PBRGraph variants to reduce shader variant count. This removes a separate option to use vertex color.
- change: material-only files are now imported as MaterialLibrary assets with Material sub-assets, even when only a single material is present
- add: log more meaningful exception messages on import
- add: sheen support for PBRGraph
- add: PBRGraph UI properly shows sheen and dispersion properties
- add: allow flipping humanoid root bone on import to support more avatar types (like Meta Avatars)
- add: new "Info" tab in GLTFImporter for asset information (generator, copyright, etc.) about the imported file
- add: ShaderOverride is now public on GLTFComponent
- add: new GLTFSceneImporter constructor overload for easier loading of files from streams
- add: meshes and textures can now be deduplicated on import, since many exporters don't properly instance them
- add: UV2 is exported as 2-, 3-, or 4-component texture coordinate. 3- and 4-component texture coordinates are not in the core glTF spec, but widely supported by implementations.
- add: complete PBRGraph and UnlitGraph Shader Variant Collections for easier runtime import and export of glTF files
- add: options for shader pass stripping in builds to reduce variant count and compilation times
- add: ability to export a set of materials as material-only glTF or glb file
- add: option to add new materials to glTF Material Libraries (material-only files)

## [2.13.0] - 2024-07-23

- fix: empty or invalid root transforms should not be exported
- fix: when no root transforms are exported, no scene should be created by default
- fix: image filenames were sometimes incorrectly exported when exporting .gltf files (#737)
- fix: set wrap mode for legacy animation import mode
- fix: added missing ExtTransform for some textures in animationpointer import/export, fixes when only offset exist (#740)
- fix: added uv-starts-at-top check for transmission support on WebGL and other platforms (#746)
- fix: added missing generate mitmaps to ktx texture load (#752)
- fix: bone name mapping for exact names was not applied on humanoid import (#751)
- fix: added missing using system for uwp target (#757)
- add: allow importing non-standard VEC3 and VEC4 TEXCOORD_n data and convert it to VEC2
- add: exposed texture readwrite enabled and generate mipmaps option to importer
- change: removed log for loaded node count mismatch, extensions can modify node counts so the log was misleading
- change: removed loaded texture count error log: when multiple samplers are used for one texture, the textures will be duplicated

## [2.12.0] - 2024-05-06

- fix: PolySpatial support now also includes emission textures and colors
Expand Down
Loading