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/blender/makesdna | |
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/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_controller_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_sensor_types.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index f4e2ff43fc5..99f0c999a29 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -264,7 +264,7 @@ typedef struct bActuator { * For ipo's and props: to find out which object the actuator * belongs to */ struct Object *ob; - + } bActuator; /* objectactuator->flag */ @@ -322,6 +322,7 @@ typedef struct bActuator { #define ACT_LINKED 8 #define ACT_VISIBLE 16 #define ACT_PIN 32 +#define ACT_DEACTIVATE 64 /* link codes */ #define LINK_SENSOR 0 diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h index 0c1aaf5fd20..154542d60c5 100644 --- a/source/blender/makesdna/DNA_controller_types.h +++ b/source/blender/makesdna/DNA_controller_types.h @@ -83,6 +83,7 @@ typedef struct bController { #define CONT_NEW 4 #define CONT_MASK 8 #define CONT_PRIO 16 +#define CONT_DEACTIVATE 32 /* pyctrl->flag */ #define CONT_PY_DEBUG 1 diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h index 1b946c829fd..fcdbbe31541 100644 --- a/source/blender/makesdna/DNA_sensor_types.h +++ b/source/blender/makesdna/DNA_sensor_types.h @@ -257,6 +257,7 @@ typedef struct bJoystickSensor { #define SENS_NOT 8 #define SENS_VISIBLE 16 #define SENS_PIN 32 +#define SENS_DEACTIVATE 64 /* sensor->pulse */ #define SENS_PULSE_CONT 0 |