diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-11 15:20:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-17 15:59:07 +0300 |
| commit | 7b3a18f0aa3ed9612aca602878a8ebdf2f1250f9 (patch) | |
| tree | 4f8ff9cdc37f66dd200946f4589e13d135f1e140 /source/blender/draw/modes/object_mode.c | |
| parent | f8e2dba7fe429c6e514a2f12ff35addc8f474294 (diff) | |
Cleanup: moving shading type into View3DShading.
So all shading settings are in this struct and can be reused in the OpenGL
render engine.
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 43400b3bac0..386261b64d7 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -907,7 +907,7 @@ static void OBJECT_cache_init(void *vedata) OBJECT_PrivateData *g_data; const DRWContextState *draw_ctx = DRW_context_state_get(); const bool xray_enabled = ((draw_ctx->v3d->shading.flag & V3D_SHADING_XRAY) != 0) && - (draw_ctx->v3d->drawtype < OB_MATERIAL); + (draw_ctx->v3d->shading.type < OB_MATERIAL); /* TODO : use dpi setting for enabling the second pass */ const bool do_outline_expand = false; @@ -2337,7 +2337,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) if ((ob != draw_ctx->object_edit) && !((ob == draw_ctx->obact) && (draw_ctx->object_mode & OB_MODE_ALL_PAINT))) { struct Gwn_Batch *geom; const bool xray_enabled = ((v3d->shading.flag & V3D_SHADING_XRAY) != 0) && - (v3d->drawtype < OB_MATERIAL); + (v3d->shading.type < OB_MATERIAL); if (xray_enabled) { geom = DRW_cache_object_edge_detection_get(ob, NULL); } |