resolve conflicts on merge with upstream master

Stephen Birarda committed 12 years ago

Commit 2aaa9ce2 parents b009cd8 ade02c040 files · +1485 −444Browse files

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

Unified · Split

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

@@ -118,6 +118,7 @@ void ScriptEngine::init() { · 117 unmodified lines
118	registerMetaTypes(&_engine);	118	registerMetaTypes(&_engine);
119	qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);	119	qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
120	qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);	120	qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
		121	qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);
121		122
122	QScriptValue agentValue = _engine.newQObject(this);	123	QScriptValue agentValue = _engine.newQObject(this);
123	_engine.globalObject().setProperty("Agent", agentValue);	124	_engine.globalObject().setProperty("Agent", agentValue);