diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-02-09 12:38:30 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-02-09 12:38:30 +0300 |
| commit | 91bc7134674813b6467801739d8c3e7013c99751 (patch) | |
| tree | aacd3b00457145d45fd253c1263b5eeb03d1097a /source/blender/src/editscreen.c | |
| parent | 6332fc3d8c59e8cf8e8f3e17cf0ca823a71df142 (diff) | |
Bugfix #5941
When making an area fullscreen, the 3d preview render should be reset.
This already worked correct in 2.42, but stopped working after bugfixes!
Diffstat (limited to 'source/blender/src/editscreen.c')
| -rw-r--r-- | source/blender/src/editscreen.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index 94132768d4e..d270a3fbca0 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -174,8 +174,8 @@ static int choose_cursor(ScrArea *sa) { if (sa->spacetype==SPACE_VIEW3D) { if(G.obedit) return CURSOR_EDIT; - else if(G.f & G_VERTEXPAINT) return CURSOR_VPAINT; - else if(G.f & G_WEIGHTPAINT) return CURSOR_VPAINT; + else if(G.f & (G_VERTEXPAINT|G_WEIGHTPAINT|G_TEXTUREPAINT)) + return CURSOR_VPAINT; else if(G.f & G_FACESELECT) return CURSOR_FACESEL; else if(G.f & G_SCULPTMODE) return CURSOR_EDIT; else return CURSOR_STD; @@ -1854,12 +1854,15 @@ static void copy_areadata(ScrArea *sa1, ScrArea *sa2, int swap_space) if(swap_space) { SWAP(ListBase, sa1->spacedata, sa2->spacedata); + /* exception: ensure preview is reset */ + if(sa1->spacetype==SPACE_VIEW3D) + BIF_view3d_previewrender_free(sa1->spacedata.first); } else { freespacelist(sa1); duplicatespacelist(sa1, &sa1->spacedata, &sa2->spacedata); } - + BLI_freelistN(&sa1->panels); duplicatelist(&sa1->panels, &sa2->panels); |