Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:56:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #743 from ctrlaltdavid/fix/glb-asset-server

Browse source 
Fix GLB files not being able to be added from Asset Server
This commit is contained in:
kasenvr 2020-09-22 00:23:45 -04:00 committed by GitHub
commit 894ffda5c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/AssetServer.qml
View file

@ -148,7 +148,7 @@ Windows.ScrollingWindow {
} }
function canAddToWorld(path) { function canAddToWorld(path) {
var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i]; var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i, /\.glb\b/i];
if (selectedItemCount > 1) { if (selectedItemCount > 1) {
return false; return false;

2
interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
View file

@ -148,7 +148,7 @@ Rectangle {
} }
function canAddToWorld(path) { function canAddToWorld(path) {
var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i]; var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i, /\.glb\b/i];
if (selectedItemCount > 1) { if (selectedItemCount > 1) {
return false; return false;