From 96aa9f7002aa2d87b815a73f8aa86cc9b1fdf9e7 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Wed, 5 May 2010 00:12:31 +0000 Subject: Logic Editor UI work * Re-structured code (can delete the old function entirely when this is done) * Fixed links/inlinks * Fixed some bugs in add and remove controller/actuator * Cleaned up some ui layouts * Use key event types in keyboard sensor * Implemented object controller 'state' in RNA/layout engine (still needs tweaks) --- source/blender/makesdna/DNA_object_types.h | 2 ++ source/blender/makesdna/DNA_space_types.h | 1 + 2 files changed, 3 insertions(+) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 38aa992a279..698492e6715 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -437,6 +437,8 @@ extern Object workob; #define OB_RECALC_TIME 4 #define OB_RECALC 7 +/* controller state */ +#define OB_MAX_STATES 30 /* ob->gameflag */ #define OB_DYNAMIC 1 diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index e7ee04b2328..70419b6a662 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -628,6 +628,7 @@ typedef struct SpaceUserPref { #define BUTS_ACT_LINK 256 #define BUTS_SENS_STATE 512 #define BUTS_ACT_STATE 1024 +#define BUTS_CONT_INIT_STATE 2048 /* FileSelectParams.display */ enum FileDisplayTypeE { -- cgit v1.2.3