diff options
| author | Antonioya <blendergit@gmail.com> | 2018-12-14 18:45:57 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-12-14 18:52:12 +0300 |
| commit | 780f0f646da1aac01dc3164fd7d493426aca9e19 (patch) | |
| tree | 453cb60e732399e22279e8eee7a1c9725416c427 /source/blender/draw | |
| parent | a1c8595b090254c1270bb66118304186a3add913 (diff) | |
GP: Rename CTX and OB modes
Part of T59335.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 8 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_view.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 2450f9419bf..87772a72015 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -1577,7 +1577,7 @@ void DRW_gpencil_populate_datablock( opacity = opacity * v3d->overlay.xray_alpha_bone; } /* fade no active layers */ - if ((overlay) && (draw_ctx->object_mode == OB_MODE_GPENCIL_PAINT) && + if ((overlay) && (draw_ctx->object_mode == OB_MODE_PAINT_GPENCIL) && (v3d->gp_flag & V3D_GP_FADE_NOACTIVE_LAYERS) && (draw_ctx->obact) && (draw_ctx->obact == ob) && (gpl != gpl_active)) diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 494cae467b4..38938ea107c 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1255,10 +1255,10 @@ static void drw_engines_enable_from_mode(int mode) case CTX_MODE_PAINT_VERTEX: case CTX_MODE_PAINT_TEXTURE: case CTX_MODE_OBJECT: - case CTX_MODE_GPENCIL_PAINT: - case CTX_MODE_GPENCIL_EDIT: - case CTX_MODE_GPENCIL_SCULPT: - case CTX_MODE_GPENCIL_WEIGHT: + case CTX_MODE_PAINT_GPENCIL: + case CTX_MODE_EDIT_GPENCIL: + case CTX_MODE_SCULPT_GPENCIL: + case CTX_MODE_WEIGHT_GPENCIL: break; default: BLI_assert(!"Draw mode invalid"); diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 4a890c3be84..4c53049e772 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -154,7 +154,7 @@ static bool is_cursor_visible(const DRWContextState *draw_ctx, Scene *scene, Vie /* no exception met? then don't draw cursor! */ return false; } - else if (draw_ctx->object_mode & OB_MODE_GPENCIL_WEIGHT) { + else if (draw_ctx->object_mode & OB_MODE_WEIGHT_GPENCIL) { /* grease pencil hide always in some modes */ return false; } |