griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPencil: Disable Outline if Overlay is disabled

Browse Source 
The main overlay switch and outline option must be checked.
This commit is contained in:
Antonioya
2019-02-28 15:58:03 +01:00
parent 175cb0a0af
commit 0f37d7162b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

@@ -830,6 +830,7 @@ void GPENCIL_draw_scene(void *ved)
const bool is_render = stl->storage->is_render;
bGPdata *gpd_act = (obact) && (obact->type == OB_GPENCIL) ? (bGPdata *)obact->data : NULL;
const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd_act);
const bool overlay = v3d != NULL ? (bool)((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) : true;
/* if the draw is for select, do a basic drawing and return */
if (DRW_state_is_select()) {
@@ -984,9 +985,11 @@ void GPENCIL_draw_scene(void *ved)
stl->storage->tonemapping = stl->storage->is_render ? 1 : 0;
/* active select flag and selection color */
stl->storage->do_select = ((ob->base_flag & BASE_SELECTED) &&
stl->storage->do_select = ((overlay) &&
(ob->base_flag & BASE_SELECTED) &&
(ob->mode == OB_MODE_OBJECT) &&
(!is_render) && (!playing));
(!is_render) && (!playing) &&
(v3d->flag & V3D_SELECT_OUTLINE));
/* if active object is not object mode, disable for all objects */
if ((draw_ctx->obact) && (draw_ctx->obact->mode != OB_MODE_OBJECT)) {