diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-11-09 17:54:59 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-11-09 17:54:59 +0300 |
| commit | 4c122988320d866b16a06ea4404d278bc8d13715 (patch) | |
| tree | c1e9f16591f163607240ed742497ba5408cd4793 /source/blender/makesdna/DNA_screen_types.h | |
| parent | 2b96175608a898f5fd00a56250551878e40ec9be (diff) | |
Bugfix #20812 (and probably others)
Issue: in user preferences window, using file selecting caused the
the userpref window to be saved, and not closing.
Reason: design error (by me) in using screen->full tag for denoting
a temporarily screen (like file window). Fixed by using a new
screen->temp variable for it.
System remained unstable though, noticed another issue with freeing
temp screens in wrong places. Seems nice stable now! Will check on
the wiki for relarted issues now.
Diffstat (limited to 'source/blender/makesdna/DNA_screen_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index a811fd9c014..7091bc79a5b 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -54,7 +54,8 @@ typedef struct bScreen { struct Scene *scene; struct Scene *newscene; /* temporary when switching */ - short full; /* fade out? */ + short full; /* temp screen for image render display or fileselect */ + short temp; /* temp screen in a temp window, don't save (like user prefs) */ short winid; /* winid from WM, starts with 1 */ short do_draw; /* notifier for drawing edges */ short do_refresh; /* notifier for scale screen, changed screen, etc */ @@ -66,7 +67,7 @@ typedef struct bScreen { short mainwin; /* screensize subwindow, for screenedges and global menus */ short subwinactive; /* active subwindow */ - int pad2; + short pad; struct wmTimer *animtimer; /* if set, screen has timer handler added in window */ void *context; /* context callback */ @@ -187,10 +188,9 @@ typedef struct ARegion { #define HEADERDOWN 1 #define HEADERTOP 2 +/* screen->full */ #define SCREENNORMAL 0 #define SCREENFULL 1 -#define SCREENAUTOPLAY 2 -#define SCREENTEMP 3 /* Panel->snap - for snapping to screen edges */ |