NLA SoC: Merge from 2.5

[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 b2c5121c1eda9d46ff7101c23316f0cb37f64473..0a342634753db4bb46989d87163129e6bb3cb9c5 100644 (file)
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -244,10 +244,11 @@ typedef struct SpaceNla {
 
        short blockhandler[8];
 
-       short menunr, lock;
        short autosnap;                 /* this uses the same settings as autosnap for Action Editor */
        short flag;
+       int pad;
        
+       struct bDopeSheet *ads;
        View2D v2d;      /* depricated, copied to region */
 } SpaceNla;