Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 14:42:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:highfidelity/hifi

Browse source
This commit is contained in:
Anna 2019-06-10 08:55:48 -07:00
commit 67775c59f1
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/tablet/TabletMenuStack.qml
View file

@ -49,7 +49,10 @@ Item {
} }
function pushSource(path) { function pushSource(path) {
d.push(Qt.resolvedUrl("../../" + path)); // Workaround issue https://bugreports.qt.io/browse/QTBUG-75516 in Qt 5.12.3
// by creating the manually, instead of letting StackView do it for us.
var item = Qt.createComponent(Qt.resolvedUrl("../../" + path));
d.push(item);
if (d.currentItem.sendToScript !== undefined) { if (d.currentItem.sendToScript !== undefined) {
d.currentItem.sendToScript.connect(tabletMenu.sendToScript); d.currentItem.sendToScript.connect(tabletMenu.sendToScript);
} }

4
interface/src/Application.cpp
View file

@ -5171,11 +5171,13 @@ ivec2 Application::getMouse() const {
} }
FaceTracker* Application::getActiveFaceTracker() { FaceTracker* Application::getActiveFaceTracker() {
#ifdef HAVE_DDE
auto dde = DependencyManager::get<DdeFaceTracker>(); auto dde = DependencyManager::get<DdeFaceTracker>();
if (dde && dde->isActive()) { if (dde && dde->isActive()) {
return static_cast<FaceTracker*>(dde.data()); return static_cast<FaceTracker*>(dde.data());
} }
#endif
return nullptr; return nullptr;
} }
@ -7218,7 +7220,7 @@ void Application::nodeKilled(SharedNodePointer node) {
_octreeProcessor.nodeKilled(node); _octreeProcessor.nodeKilled(node);
_entityEditSender.nodeKilled(node); _entityEditSender.nodeKilled(node);
if (node->getType() == NodeType::AudioMixer) { if (node->getType() == NodeType::AudioMixer) {
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "audioMixerKilled"); QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "audioMixerKilled");
} else if (node->getType() == NodeType::EntityServer) { } else if (node->getType() == NodeType::EntityServer) {