diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-31 14:55:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-31 14:58:52 +0300 |
| commit | 77eaa4790d370b5f8c3faa2ca65e8466a1259863 (patch) | |
| tree | 3f2bf1bb21b6cfdfa7b63deb9a299b8819765a87 /source/blender/editors/sculpt_paint/paint_image_undo.c | |
| parent | b5e93b02c9cfffefe46a067389333ab871bd8605 (diff) | |
Fix T61032: Switching to sculpt tab causes undo to set object mode
Workspace switching changed modes w/o the 3D view,
causing sculpt undo's poll function to fail.
Applied the same logic for texture paint too.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_undo.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_undo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_undo.c b/source/blender/editors/sculpt_paint/paint_image_undo.c index 0cf56726abf..3a7f4218286 100644 --- a/source/blender/editors/sculpt_paint/paint_image_undo.c +++ b/source/blender/editors/sculpt_paint/paint_image_undo.c @@ -418,11 +418,13 @@ static bool image_undosys_poll(bContext *C) ScrArea *sa = CTX_wm_area(C); if (sa && (sa->spacetype == SPACE_IMAGE)) { SpaceImage *sima = (SpaceImage *)sa->spacedata.first; - if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) { + if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || + (sima->mode == SI_MODE_PAINT)) + { return true; } } - else if (sa && (sa->spacetype == SPACE_VIEW3D)) { + else { if (obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) { return true; } |