2.5: Various Fixes

[blender-staging.git] / source / blender / makesdna / DNA_space_types.h

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 4760fd00bf2cbf514b46ea0a880355814c1eb41e..3db9711209008299eb72c147d955d8b3485bbc56 100644 (file)
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -94,7 +94,7 @@ typedef struct SpaceIpo {
        float blockscale;
 
        short blockhandler[8];
-       View2D v2d; /* depricated, copied to region */
+       View2D v2d; /* deprecated, copied to region */
        
        struct bDopeSheet *ads; /* settings for filtering animation data (NOTE: we use a pointer due to code-linking issues) */
        
@@ -116,24 +116,12 @@ typedef struct SpaceButs {
        
        struct RenderInfo *ri;
 
-       short cursens, curact;
-       short align, preview;           /* align for panels, preview is signal to refresh */
-       View2D v2d; /* depricated, copied to region */
+       View2D v2d;                                             /* deprecated, copied to region */
        
-       short mainb, menunr;    /* texnr and menunr have to remain shorts */
-       short pin, mainbo;      
-       void *lockpoin;
-       
-       short texnr;
-       char texfrom, showgroup;
-       
-       short modeltype;
-       short scriptblock;
-       short scaflag;
-       short re_align;
-       
-       short oldkeypress;              /* for keeping track of the sub tab key cycling */
-       char flag, texact;
+       short mainb, mainbo, mainbuser; /* context tabs */
+       short re_align, align;                  /* align for panels */
+       short preview;                                  /* preview is signal to refresh */
+       char flag, pad[3];
        
        void *path;                             /* runtime */
        int pathflag, dataicon; /* runtime */
@@ -148,7 +136,7 @@ typedef struct SpaceSeq {
 
        short blockhandler[8];
 
-       View2D v2d; /* depricated, copied to region */
+       View2D v2d; /* deprecated, copied to region */
        
        float xof, yof; /* offset for drawing the image preview */
        short mainb;
@@ -222,7 +210,7 @@ typedef struct SpaceOops {
 
        short blockhandler[8];
 
-       View2D v2d; /* depricated, copied to region */
+       View2D v2d; /* deprecated, copied to region */
        
        ListBase tree;
        struct TreeStore *treestore;
@@ -277,7 +265,7 @@ typedef struct SpaceNla {
        int pad;
        
        struct bDopeSheet *ads;
-       View2D v2d;      /* depricated, copied to region */
+       View2D v2d;      /* deprecated, copied to region */
 } SpaceNla;
 
 typedef struct SpaceText {
@@ -349,7 +337,7 @@ typedef struct SpaceTime {
        int spacetype;
        float blockscale;
        
-       View2D v2d; /* depricated, copied to region */
+       View2D v2d; /* deprecated, copied to region */
        
        int flag, redraws;
        
@@ -363,7 +351,7 @@ typedef struct SpaceNode {
        
        short blockhandler[8];
        
-       View2D v2d; /* depricated, copied to region */
+       View2D v2d; /* deprecated, copied to region */
        
        struct ID *id, *from;           /* context, no need to save in file? well... pinning... */
        short flag, menunr;                     /* menunr: browse id block in header */
@@ -412,7 +400,7 @@ typedef struct SpaceImaSel {
        
        short blockhandler[8];
 
-       View2D v2d; /* depricated, copied to region */
+       View2D v2d; /* deprecated, copied to region */
 
        struct FileList *files;