History

Merge branch 'master' of https://github.com/highfidelity/hifi into getEntityPropertiesPerformance

Brad Hefta-Gaub committed 11 years ago

Commit 6fac4472 parents 248107c da74d4b14 files · +70 −67Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−1
@@ -405,7 +405,7 @@ void ScriptEngine::registerGetterSetter(const QString& name, QScriptEngine::Func · 404 unmodified lines
405 QScriptValue setterFunction = newFunction(setter, 1);405 QScriptValue setterFunction = newFunction(setter, 1);
406 QScriptValue getterFunction = newFunction(getter);406 QScriptValue getterFunction = newFunction(getter);
407 407
408 if (!parent.isNull()) {408 if (!parent.isNull() && !parent.isEmpty()) {
409 QScriptValue object = globalObject().property(parent);409 QScriptValue object = globalObject().property(parent);
410 if (object.isValid()) {410 if (object.isValid()) {
411 object.setProperty(name, setterFunction, QScriptValue::PropertySetter);411 object.setProperty(name, setterFunction, QScriptValue::PropertySetter);

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