History

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

stojce committed 12 years ago

Commit f002cda2 parents 9d58964 e29d62121 files · +384 −126Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -4059,7 +4059,7 @@ void Application::loadScript(const QString& fileNameString) { · 4058 unmodified lines
40594059 scriptEngine->getParticlesScriptingInterface()->setParticleTree(_particles.getTree());
40604060
40614061 // hook our avatar object into this script engine
4062− scriptEngine->setAvatarData( static_cast<Avatar*>(_myAvatar), "MyAvatar");
4062+ scriptEngine->setAvatarData(_myAvatar, "MyAvatar"); // leave it as a MyAvatar class to expose thrust features
40634063
40644064 CameraScriptableObject* cameraScriptable = new CameraScriptableObject(&_myCamera, &_viewFrustum);
40654065 scriptEngine->registerGlobalObject("Camera", cameraScriptable);

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