diff options
| author | Matt Ebb <matt@mke3.net> | 2010-05-05 04:12:31 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-05-05 04:12:31 +0400 |
| commit | 96aa9f7002aa2d87b815a73f8aa86cc9b1fdf9e7 (patch) | |
| tree | 940307f45d4761f9c3233c0173410cdff9dff486 /source/blender/makesdna | |
| parent | c3cd8175c1c542ea9478a87c921f64adf1add9c1 (diff) | |
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)
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 1 |
2 files changed, 3 insertions, 0 deletions
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 { |