Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / source / blender / makesdna / DNA_controller_types.h
index 95c9b0d0cf7b0f72fed212d014bdd2048b74321a..376f95b0145147d9a8f59dc0419a4c2ef03fa544 100644 (file)
@@ -57,7 +57,7 @@ typedef struct bController {
 
        struct bSensor **slinks;
        short val, valo;
-       int pad5;
+       unsigned int state_mask;
        
 } bController;
 
@@ -66,11 +66,16 @@ typedef struct bController {
 #define CONT_LOGIC_OR  1
 #define CONT_EXPRESSION        2
 #define CONT_PYTHON            3
+#define CONT_LOGIC_NAND        4
+#define CONT_LOGIC_NOR 5
+#define CONT_LOGIC_XOR 6
+#define CONT_LOGIC_XNOR        7
 
 /* controller->flag */
 #define CONT_SHOW              1
 #define CONT_DEL               2
 #define CONT_NEW               4
+#define CONT_MASK              8
 
 #endif