History

resolve conflicts and cleanup

SamGondelman committed 9 years ago

Commit 76869482 parents fb96996 58172cf31 files · +446 −239Browse files

Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 31 files). Show all

Unified · Split

interface/src/raypick/LaserPointerScriptingInterface.cpp+1−5
@@ -11,12 +11,8 @@ · 10 unmodified lines
1111
1212 #include "LaserPointerScriptingInterface.h"
1313
14−#include <QtCore/QVariant>
15−
16−#include <GLMHelpers.h>
17−
14+#include "RegisteredMetaTypes.h"
1815 #include "PointerScriptingInterface.h"
19−#include "Application.h"
2016
2117 void LaserPointerScriptingInterface::setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreItems) const {
2218 DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t