diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-03-20 12:30:35 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-03-24 11:50:09 +0300 |
| commit | a6dd22d4311ce0265bd7678b68bff71c59404771 (patch) | |
| tree | e28b8283fa83af3dee583f51e4ef52333f447cbf /source/blender/draw | |
| parent | 579447bd892af14a306e29f487ecf11ce226d52e (diff) | |
Fix T74957: Matcap flip not updating
Caused by rBc476c36e4008.
This hooks into the existing FIXME (workaround for a missing update
tagging from operators), needs to also check the shading.flag (to detect
changes in V3D_SHADING_MATCAP_FLIP_X).
Differential Revision: https://developer.blender.org/D7192
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_data.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index f000028562f..ceb57327fb0 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -203,7 +203,8 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) /* FIXME: This reproduce old behavior when workbench was separated in 2 engines. * But this is a workaround for a missing update tagging from operators. */ if (scene->display.shading.type != wpd->shading.type || - (v3d && (XRAY_ENABLED(v3d) != XRAY_ENABLED(&scene->display)))) { + (v3d && (XRAY_ENABLED(v3d) != XRAY_ENABLED(&scene->display))) || + (scene->display.shading.flag != wpd->shading.flag)) { wpd->view_updated = true; } @@ -229,7 +230,8 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) else { /* FIXME: This reproduce old behavior when workbench was separated in 2 engines. * But this is a workaround for a missing update tagging from operators. */ - if (v3d->shading.type != wpd->shading.type || XRAY_ENABLED(v3d) != XRAY_ENABLED(wpd)) { + if (v3d->shading.type != wpd->shading.type || XRAY_ENABLED(v3d) != XRAY_ENABLED(wpd) || + v3d->shading.flag != wpd->shading.flag) { wpd->view_updated = true; } |