At last... this merge should finally do the trick!
[blender.git] / source / blender / makesdna / DNA_space_types.h
index 9dc7e07a95c122a618ae4d9e1f131c8385938f7b..f66c0c31fda1eab9f4855b3faf3835377d4927ec 100644 (file)
@@ -246,10 +246,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;
 
@@ -711,8 +712,11 @@ enum {
 #define IMS_INFILESLI          4
 
 /* nla->flag */
+       // depreceated
 #define SNLA_ALLKEYED          (1<<0)
+       // depreceated
 #define SNLA_ACTIVELAYERS      (1<<1)
+
 #define SNLA_DRAWTIME          (1<<2)
 #define SNLA_NOTRANSKEYCULL    (1<<3)
 #define SNLA_NODRAWCFRANUM     (1<<4)