diff options
author | Jorge Bernal <jbernalmartinez@gmail.com> | 2014-04-17 05:23:29 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2014-04-17 05:40:07 +0400 |
commit | a5b9f22454cc36c8811b10fe65d40ec900497922 (patch) | |
tree | b28160483e995b0443788bfefbbaa2c81febfc25 /source/gameengine/Converter/KX_ConvertControllers.cpp | |
parent | 8a4210074c0d20af7aa1fe8b03839086f3f39078 (diff) |
BGE - button for deactivate sensors, controllers and actuators
This change introduces a new checkbox to deactivate the sensors, controllers and/or actuators. It is useful during the development phase to avoid delete sensors, controllers or actuators if you want to test something new.
NOC: The wiki page is being updated (the images mostly), but the feature is already in the 2.71 release log.
{F61628}
Reviewers: moguri, dfelinto, campbellbarton, dingto, #user_interface, billrey
Reviewed By: moguri
CC: billrey
Differential Revision: https://developer.blender.org/D16
Diffstat (limited to 'source/gameengine/Converter/KX_ConvertControllers.cpp')
-rw-r--r-- | source/gameengine/Converter/KX_ConvertControllers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp index ab5f1611cb9..cd7a560edad 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.cpp +++ b/source/gameengine/Converter/KX_ConvertControllers.cpp @@ -197,7 +197,7 @@ void BL_ConvertControllers( } } - if (gamecontroller) + if (gamecontroller && !(bcontr->flag & CONT_DEACTIVATE)) { LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter); gamecontroller->SetExecutePriority(executePriority++); |