History

Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins

Sam Gondelman committed 11 years ago

Commit 54f64b62 parents 3256e30 985bdb2181 files · +5726 −48030Browse 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 }