svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / blender / makesdna / DNA_screen_types.h
index 4891f44e1cd1dbf43fdb9b588877676f90202f05..d9d68490425933120c3153648b74902149186723 100644 (file)
@@ -53,6 +53,7 @@ typedef struct bScreen {
        ListBase regionbase;                            /* screen level regions (menus), runtime only */
        
        struct Scene *scene;
+       struct Scene *newscene;                         /* temporary when switching */
        
        short full;                                                     /* fade out? */
        short winid;                                            /* winid from WM, starts with 1 */
@@ -104,6 +105,9 @@ typedef struct Panel {              /* the part from uiBlock that needs saved in file */
        int sortorder;                  /* panels are aligned according to increasing sortorder */
        struct Panel *paneltab;         /* this panel is tabbed in *paneltab */
        void *activedata;                       /* runtime for panel manipulation */
+
+       int list_scroll, list_size;
+       char list_search[64];
 } Panel;
 
 typedef struct Header {