diff options
| author | Falk David <falkdavid@gmx.de> | 2021-02-01 18:27:42 +0300 |
|---|---|---|
| committer | Falk David <falkdavid@gmx.de> | 2021-02-01 18:27:42 +0300 |
| commit | 5ec9e3a26e8cf69bf8a0845a6e51953b1d6bc801 (patch) | |
| tree | 554c7e7feddf9fd6972369958c08c035743c5c93 /source/blender/editors/gpencil/gpencil_primitive.c | |
| parent | 82e2d70024e2fa6e0ab9d32f6fb798613f6bdeee (diff) | |
| parent | 006e70dbd7e29c105809eded93169754ade03de5 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_primitive.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 3a0e1ce3d15..d94a02204a2 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -717,8 +717,8 @@ static void gpencil_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) int depth_margin = (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 4 : 0; const char align_flag = ts->gpencil_v3d_align; bool is_depth = (bool)(align_flag & (GP_PROJECT_DEPTH_VIEW | GP_PROJECT_DEPTH_STROKE)); - const bool is_camera = (bool)(ts->gp_sculpt.lock_axis == 0) && - (tgpi->rv3d->persp == RV3D_CAMOB) && (!is_depth); + const bool is_lock_axis_view = (bool)(ts->gp_sculpt.lock_axis == 0); + const bool is_camera = is_lock_axis_view && (tgpi->rv3d->persp == RV3D_CAMOB) && (!is_depth); if (tgpi->type == GP_STROKE_BOX) { tgpi->tot_edges--; @@ -1082,7 +1082,7 @@ static void gpencil_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) } /* If camera view or view projection, reproject flat to view to avoid perspective effect. */ - if ((align_flag & GP_PROJECT_VIEWSPACE) || is_camera) { + if (((align_flag & GP_PROJECT_VIEWSPACE) && is_lock_axis_view) || is_camera) { ED_gpencil_project_stroke_to_view(C, tgpi->gpl, gps); } |