Merge pull request #6701 from highfidelity/graphics

Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool

Brad Hefta-Gaub committed 10 years ago

Commit 111a8ca2 parents 491d2fe e3ab23090 files · +1684 −1014Browse files

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

Unified · Split

@@ -46,7 +46,6 @@ · 45 unmodified lines
46	46	#include "XMLHttpRequestClass.h"
47	47	#include "WebSocketClass.h"
48	48
49		−#include "SceneScriptingInterface.h"
50	49	#include "RecordingScriptingInterface.h"
51	50
52	51	#include "MIDIEvent.h"