History

Merge branch 'master' into plugins

Bradley Austin Davis committed 11 years ago

Commit 7e60aee2 parents d415ee1 9215ea8181 files · +5728 −48029Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 181 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+2−1
@@ -25,7 +25,8 @@ · 24 unmodified lines
2525 ControllerScriptingInterface::ControllerScriptingInterface() :
2626 _mouseCaptured(false),
2727 _touchCaptured(false),
28− _wheelCaptured(false)
28+ _wheelCaptured(false),
29+ _actionsCaptured(false)
2930 {
3031
3132 }