Moving OpenVR to external plugin and updating to latest version

Brad Davis committed 10 years ago

Commit 978d39b1 parent a99542e16 files · +174 −127Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 16 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−1

@@ -82,7 +82,7 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) { · 81 unmodified lines
82	}	82	}
83		83
84	Q_DECLARE_METATYPE(controller::InputController*)	84	Q_DECLARE_METATYPE(controller::InputController*)
85	static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();	85	//static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
86		86
87	QScriptValue inputControllerToScriptValue(QScriptEngine engine, controller::InputController const &in) {	87	QScriptValue inputControllerToScriptValue(QScriptEngine engine, controller::InputController const &in) {
88	return engine->newQObject(in);	88	return engine->newQObject(in);