diff options
| author | Antonioya <blendergit@gmail.com> | 2018-11-04 15:00:19 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-11-04 15:00:37 +0300 |
| commit | 5cfcee8c393de6781423c9ef83716c94237fddfd (patch) | |
| tree | ee6722664cc4f00c0f79058de878030ae42afdc6 /source/blender/editors | |
| parent | d3c815bd0831f46c18bb4bddc9f290b5f47e2c45 (diff) | |
GP: Reorganize Canvas Grid
Now the grid is always controlled by the topbar selector and not in the canvas panel. To have two places to define orientation was confuse.
The orientation by default (no lock) is always to view plane.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_fill.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index d8580f872f4..12dc3451902 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -2866,7 +2866,7 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) int lock_axis = ts->gp_sculpt.lock_axis; float origin[3]; - if ((mode == GP_REPROJECT_AXIS) && (lock_axis == GP_LOCKAXIS_NONE)) { + if ((mode == GP_REPROJECT_AXIS) && (lock_axis == GP_LOCKAXIS_VIEW)) { BKE_report(op->reports, RPT_ERROR, "To reproject by axis, a lock axis must be set before"); return OPERATOR_CANCELLED; } @@ -2909,7 +2909,7 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) /* Project stroke in the axis locked */ if (mode == GP_REPROJECT_AXIS) { - if (lock_axis > GP_LOCKAXIS_NONE) { + if (lock_axis > GP_LOCKAXIS_VIEW) { ED_gp_get_drawing_reference(v3d, scene, ob, gpl, ts->gpencil_v3d_align, origin); ED_gp_project_point_to_plane(ob, rv3d, origin, diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index f940b18dac6..9b6a36ce8af 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -918,7 +918,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf) } /* if axis locked, reproject to plane locked */ - if ((tgpf->lock_axis > GP_LOCKAXIS_NONE) && ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_VIEW) == 0)) { + if ((tgpf->lock_axis > GP_LOCKAXIS_VIEW) && ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_VIEW) == 0)) { float origin[3]; ED_gp_get_drawing_reference( tgpf->v3d, tgpf->scene, tgpf->ob, tgpf->gpl, diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index baa8bc5d181..338fb7f5c6a 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -369,7 +369,7 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) } /* if axis locked, reproject to plane locked */ - if (tgpi->lock_axis > GP_LOCKAXIS_NONE) { + if (tgpi->lock_axis > GP_LOCKAXIS_VIEW) { bGPDspoint *tpt = gps->points; float origin[3]; ED_gp_get_drawing_reference(tgpi->v3d, tgpi->scene, tgpi->ob, tgpi->gpl, |