diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-29 16:57:19 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-29 16:57:19 +0300 |
commit | 4fc369564a59aeb36ce7fcfd2c6ada43a2f80777 (patch) | |
tree | 7df86d2a895012fff929d70439f7a7dd9aa355b8 /source/blender/makesdna | |
parent | f23894c3658ca876c8591d564dd73df14135ae8e (diff) |
* more work on screen
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 6563f56ed4d..5397d890789 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -37,7 +37,6 @@ extern "C" { #include "DNA_listBase.h" #include "DNA_scriptlink_types.h" #include "DNA_ID.h" -#include "DNA_scriptlink_types.h" struct Radio; struct Object; diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 39cf6454c2c..c49a70ee9cf 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -30,13 +30,13 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "DNA_ID.h" #include "DNA_scriptlink_types.h" +#include "DNA_ID.h" -struct Scene; struct SpaceType; struct SpaceLink; struct ARegionType; +struct Scene; typedef struct bScreen { ID id; @@ -81,7 +81,7 @@ typedef struct ScrEdge { * @deprecated compiling while delivering a proper dna.c. Do not use * @deprecated it in any case. */ -typedef unsigned short dna_ushort_fix; +/*typedef unsigned short dna_ushort_fix;*/ #endif |