diff options
| -rw-r--r-- | source/blender/draw/intern/draw_view.c | 7 | ||||
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 0444e298044..0c0aab7bec3 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -165,8 +165,11 @@ static bool is_cursor_visible(const DRWContextState *draw_ctx, Scene *scene, Vie return false; } - /* grease pencil draw mode hide always */ - if ((ob) && (ob->mode == OB_MODE_GPENCIL_PAINT)) { + /* grease pencil hide always in some modes */ + if ((ob) && + ((ob->mode == OB_MODE_GPENCIL_PAINT) || + (ob->mode == OB_MODE_GPENCIL_WEIGHT))) + { return false; } diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 5ba576985af..3b95f0b86d0 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -2374,9 +2374,11 @@ static void DRW_shgroup_object_center(OBJECT_StorageList *stl, Object *ob, ViewL return; } - /* grease pencil in draw mode hide always */ + /* grease pencil in some modes hide always */ if ((OBACT(view_layer)) && - (OBACT(view_layer)->mode == OB_MODE_GPENCIL_PAINT)) + ((OBACT(view_layer)->mode == OB_MODE_GPENCIL_PAINT) || + (OBACT(view_layer)->mode == OB_MODE_GPENCIL_SCULPT) || + (OBACT(view_layer)->mode == OB_MODE_GPENCIL_WEIGHT))) { return; } @@ -2760,9 +2762,9 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) DRW_shgroup_empty(sgl, ob, view_layer); break; case OB_GPENCIL: - /* in draw mode hide always */ + /* in all modes except object mode hide always */ if ((OBACT(view_layer)) && - (OBACT(view_layer)->mode == OB_MODE_GPENCIL_PAINT)) + (OBACT(view_layer)->mode != OB_MODE_OBJECT)) { break; } |