rebase fix

Atlante45 committed 11 years ago

Commit 8a7871e1 parent ed13c022 files · +5 −1Browse files

Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

@@ -70,3 +70,7 @@ void HMDScriptingInterface::toggleMagnifier() { · 69 unmodified lines
70	bool HMDScriptingInterface::getMagnifier() const {	70	bool HMDScriptingInterface::getMagnifier() const {
71	return qApp->getApplicationCompositor().hasMagnifier();	71	return qApp->getApplicationCompositor().hasMagnifier();
72	}	72	}
		73
		74	bool HMDScriptingInterface::isHMDMode() const {
		75	return qApp->isHMDMode();
		76	}