History

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

Andrzej Kapolka committed 12 years ago

Commit c6deb0c2 parents f2cfd86 da9fccc11 files · +87 −1243Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+3−0
@@ -4257,6 +4257,9 @@ void Application::loadScript(const QString& fileNameString){ · 4256 unmodified lines
4257 // we can use the same ones from the application.4257 // we can use the same ones from the application.
4258 scriptEngine->getVoxelsScriptingInterface()->setPacketSender(&_voxelEditSender);4258 scriptEngine->getVoxelsScriptingInterface()->setPacketSender(&_voxelEditSender);
4259 scriptEngine->getParticlesScriptingInterface()->setPacketSender(&_particleEditSender);4259 scriptEngine->getParticlesScriptingInterface()->setPacketSender(&_particleEditSender);
4260
4261 // hook our avatar object into this script engine
4262 scriptEngine->setAvatarData(&_myAvatar, "MyAvatar");
4260 4263
4261 QThread* workerThread = new QThread(this);4264 QThread* workerThread = new QThread(this);
4262 4265

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