[Bf-blender-cvs] [10d1edbffbf] master: Fix T56183: flip matcap not working for workbench as render engine.

[Brecht Van Lommel]

Commit: 10d1edbffbf91094015950555495e01914e09dd9
Author: Brecht Van Lommel
Date:   Mon Mar 18 19:26:01 2019 +0100
Branches: master
https://developer.blender.org/rB10d1edbffbf91094015950555495e01914e09dd9

Fix T56183: flip matcap not working for workbench as render engine.

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

M	source/blender/editors/space_view3d/view3d_header.c

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

diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 78bda66b8ff..aa97c151df5 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -68,9 +68,18 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event);
 static int toggle_matcap_flip(bContext *C, wmOperator *UNUSED(op))
 {
 	View3D *v3d = CTX_wm_view3d(C);
-	v3d->shading.flag ^= V3D_SHADING_MATCAP_FLIP_X;
-	ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C));
-	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+
+	if (v3d) {
+		v3d->shading.flag ^= V3D_SHADING_MATCAP_FLIP_X;
+		ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C));
+		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
+	}
+	else {
+		Scene *scene = CTX_data_scene(C);
+		scene->display.shading.flag ^= V3D_SHADING_MATCAP_FLIP_X;
+		WM_event_add_notifier(C, NC_SCENE | NA_EDITED, v3d);
+	}
+
 	return OPERATOR_FINISHED;
 }
 
@@ -83,7 +92,6 @@ void VIEW3D_OT_toggle_matcap_flip(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->exec = toggle_matcap_flip;
-	ot->poll = ED_operator_view3d_active;
 }
 
 /** \} */