Merge branch 'master' into 20547

David Rowe committed 11 years ago

Commit 1898c6b2 parents 93509f4 2c30711279 files · +9486 −8270Browse files

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

Unified · Split

@@ -318,7 +318,10 @@ void ScriptEngine::init() { · 317 unmodified lines
318	318	registerAnimationTypes(this);
319	319	registerAvatarTypes(this);
320	320	registerAudioMetaTypes(this);
321		− _controllerScriptingInterface->registerControllerTypes(this);
	321	+
	322	+ if (_controllerScriptingInterface) {
	323	+ _controllerScriptingInterface->registerControllerTypes(this);
	324	+ }
322	325
323	326	qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValueHonorReadOnly);
324	327	qScriptRegisterMetaType(this, EntityItemIDtoScriptValue, EntityItemIDfromScriptValue);