History

Merge branch 'master' of https://github.com/worklist/hifi into modelserver

ZappoMan committed 12 years ago

Commit 58c852d2 parents f993f98 19b76e320 files · +602 −309Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2
@@ -168,7 +168,7 @@ void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectNa · 167 unmodified lines
168168 void ScriptEngine::setAvatarHashMap(AvatarHashMap* avatarHashMap, const QString& objectName) {
169169 // remove the old Avatar property, if it exists
170170 _engine.globalObject().setProperty(objectName, QScriptValue());
171−
171+
172172 // give the script engine the new avatar hash map
173173 registerGlobalObject(objectName, avatarHashMap);
174174 }
@@ -230,7 +230,7 @@ void ScriptEngine::init() { · 55 unmodified lines
230230 registerGlobalObject("Vec3", &_vec3Library);
231231 registerGlobalObject("Uuid", &_uuidLibrary);
232232 registerGlobalObject("AnimationCache", &_animationCache);
233−
233+
234234 registerGlobalObject("Voxels", &_voxelsScriptingInterface);
235235
236236 // constants

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