diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:31:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:37:01 +0300 |
| commit | 4444ea42f29c9b006fd20c9fb6de5787ad98f30f (patch) | |
| tree | eae8908bfeae8ef77ef8a4cedef020adbf44b06d /source/blender/editors/screen/screen_edit.c | |
| parent | c850320b35863edc35f0b0acd1c75ed48bb71542 (diff) | |
| parent | ebf01d44ee0e034da169efc0aca81f99966ebde6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index d3f99dc8152..0b78590d4d8 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -589,8 +589,6 @@ int screen_area_join(bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2) /*printf("dir is : %i\n", dir);*/ if (dir == -1) { - if (sa1) sa1->flag &= ~AREA_FLAG_DRAWJOINFROM; - if (sa2) sa2->flag &= ~AREA_FLAG_DRAWJOINTO; return 0; } @@ -621,7 +619,7 @@ int screen_area_join(bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2) screen_delarea(C, scr, sa2); removedouble_scrverts(scr); - sa1->flag &= ~AREA_FLAG_DRAWJOINFROM; + /* Update preview thumbnail */ BKE_icon_changed(scr->id.icon_id); |