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

Merge pull request #15712 from amerhifi/master

Browse source 
case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef
This commit is contained in:
Shannon Romano 2019-06-07 18:59:34 -07:00 committed by GitHub
commit e213fd6b5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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) {