From 61be5a3cc4dedfe95649c548dc8f190033216db1 Mon Sep 17 00:00:00 2001
From: Clement <clement.brisset@gmail.com>
Date: Tue, 22 Jan 2019 17:00:25 -0800
Subject: [PATCH] Enable "Add To World" Asset Browser button for glTF
---
interface/resources/qml/hifi/AssetServer.qml | 2 +-
interface/resources/qml/hifi/dialogs/TabletAssetServer.qml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 247a42428a..1abd4f45ff 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -148,7 +148,7 @@ Windows.ScrollingWindow {
}
function canAddToWorld(path) {
- var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i];
+ var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i];
if (selectedItemCount > 1) {
return false;
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index b5374b2fe0..62ec264fc9 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -148,7 +148,7 @@ Rectangle {
}
function canAddToWorld(path) {
- var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i];
+ var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i];
if (selectedItemCount > 1) {
return false;