diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-22 05:28:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-22 05:28:03 +0400 |
| commit | 90db85a26301216d11c2adc956046b276ce8ef5f (patch) | |
| tree | d60e9ac8449fbf7ccaa5f7748c9e331e317deecd /source/blender | |
| parent | a217db0d6373a4050658049a9ded84f34b33f952 (diff) | |
Fix T40283: Matcaps disables GLSL shadows
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 958605bd1d6..d238865e702 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -6943,7 +6943,11 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short } /* matcap check - only when not painting color */ - if ((v3d->flag2 & V3D_SOLID_MATCAP) && (dt == OB_SOLID) && (is_paint == false && is_picking == false)) { + if ((v3d->flag2 & V3D_SOLID_MATCAP) && + (dt == OB_SOLID) && + (is_paint == false && is_picking == false) && + ((v3d->flag2 & V3D_RENDER_SHADOW) == 0)) + { draw_object_matcap_check(v3d, ob); } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index d7a4ae4942b..1175e6731c8 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2453,7 +2453,7 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d) v3d->drawtype = OB_SOLID; v3d->lay &= GPU_lamp_shadow_layer(shadow->lamp); - v3d->flag2 &= ~V3D_SOLID_TEX; + v3d->flag2 &= ~V3D_SOLID_TEX | V3D_SHOW_SOLID_MATCAP; v3d->flag2 |= V3D_RENDER_OVERRIDE | V3D_RENDER_SHADOW; GPU_lamp_shadow_buffer_bind(shadow->lamp, viewmat, &winsize, winmat); |