Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 22:07:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed fileDialog return value to be compatible with musvis

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-11-07 16:55:07 -08:00
parent 89a9269982
commit e37010565f
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -2702,7 +2702,6 @@ bool Application::importFromZIP(const QString& filePath) {
return true;
}
<<<<<<< HEAD
bool Application::importFromFBX(const QString& filePath) {
qDebug() << "An fbx file has been dropped in: " << filePath;
QUrl empty;
@ -2715,9 +2714,6 @@ bool Application::importFromFBX(const QString& filePath) {
return true;
}
=======
// thread-safe
>>>>>>> 85efe5265d1e31eccae22571e407b938030c8f6e
void Application::onPresent(quint32 frameCount) {
bool expected = false;
if (_pendingIdleEvent.compare_exchange_strong(expected, true)) {

3
libraries/ui/src/OffscreenUi.cpp
View file

@ -720,7 +720,8 @@ QString OffscreenUi::fileDialog(const QVariantMap& properties) {
return QString();
}
qCDebug(uiLogging) << result.toString();
return result.toUrl().toLocalFile();
// originally was result.toUrl().toLocalFile();, but toLocalFile() is not working
return result.toString();
}
ModalDialogListener* OffscreenUi::fileDialogAsync(const QVariantMap& properties) {