History

fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine

ericrius1 committed 11 years ago

Commit 697cb4c2 parents 469bace 6a5c298406 files · +11309 −11832Browse files

Showing the changes to libraries/script-engine/src/SceneScriptingInterface.h (1 of 406 files). Show all

Unified · Split

libraries/script-engine/src/SceneScriptingInterface.h+1−1
@@ -120,7 +120,7 @@ protected: · 119 unmodified lines
120120 SceneScriptingInterface() {};
121121 ~SceneScriptingInterface() {};
122122
123− model::SunSkyStagePointer _skyStage = model::SunSkyStagePointer(new model::SunSkyStage());
123+ model::SunSkyStagePointer _skyStage = std::make_shared<model::SunSkyStage>();
124124
125125 bool _shouldRenderAvatars = true;
126126 bool _shouldRenderEntities = true;

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