[Bf-blender-cvs] [77eaa4790d3] master: Fix T61032: Switching to sculpt tab causes undo to set object mode

[Campbell Barton]

Commit: 77eaa4790d370b5f8c3faa2ca65e8466a1259863
Author: Campbell Barton
Date:   Thu Jan 31 22:55:29 2019 +1100
Branches: master
https://developer.blender.org/rB77eaa4790d370b5f8c3faa2ca65e8466a1259863

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.

===================================================================

M	source/blender/editors/sculpt_paint/paint_image_undo.c
M	source/blender/editors/sculpt_paint/sculpt_undo.c

===================================================================

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;
 		}
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 8b8493aa415..884d81d7e9e 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -1031,10 +1031,8 @@ typedef struct SculptUndoStep {
 
 static bool sculpt_undosys_poll(bContext *C)
 {
-	ScrArea *sa = CTX_wm_area(C);
-	if (sa && (sa->spacetype == SPACE_VIEW3D)) {
-		ViewLayer *view_layer = CTX_data_view_layer(C);
-		Object *obact = OBACT(view_layer);
+	Object *obact = CTX_data_active_object(C);
+	if (obact && obact->type == OB_MESH) {
 		if (obact && (obact->mode & OB_MODE_SCULPT)) {
 			return true;
 		}