diff options
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_buttons.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 54dd43160a6..4f12f072e72 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -254,16 +254,18 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi } /* draw gpd drawing settings first ------------------------------------- */ - col= uiLayoutColumn(layout, 0); + col= uiLayoutColumn(layout, 1); /* label */ uiItemL(col, "Drawing Settings:", 0); /* 'stick to view' option */ //uiItemR(col, NULL, 0, &gpd_ptr, "draw_mode", 0); - row= uiLayoutRow(layout, 1); + row= uiLayoutRow(col, 1); uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode", "VIEW"); uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode", "CURSOR"); - uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode", "DEPTH"); + row= uiLayoutRow(col, 1); + uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode", "SURFACE"); + uiItemEnumR_string(row, NULL, 0, &gpd_ptr, "draw_mode", "STROKE"); } diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 905f8c482e9..d48ff411f10 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -155,7 +155,7 @@ static int gpencil_draw_poll (bContext *C) static int gpencil_project_check (tGPsdata *p) { bGPdata *gpd= p->gpd; - return ((gpd->sbuffer_sflag & GP_STROKE_3DSPACE) && (p->gpd->flag & GP_DATA_VIEWDEPTH)) ? 1:0; + return ((gpd->sbuffer_sflag & GP_STROKE_3DSPACE) && (p->gpd->flag & (GP_DATA_DEPTH_VIEW | GP_DATA_DEPTH_STROKE))) ? 1:0; } /* ******************************************* */ @@ -1165,7 +1165,7 @@ static void gpencil_draw_exit (bContext *C, wmOperator *op) /* need to restore the original projection settings before packing up */ view3d_operator_needs_opengl(C); - view_autodist_init(p->scene, p->ar, v3d); + view_autodist_init(p->scene, p->ar, v3d, (p->gpd->flag & GP_DATA_DEPTH_STROKE) ? 1:0); } gp_paint_cleanup(p); |