diff options
author | Antonioya <blendergit@gmail.com> | 2019-06-24 11:14:39 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2019-06-24 11:14:39 +0300 |
commit | 3fb099bf815271a4323e22054893b266fc9c9483 (patch) | |
tree | 45ef33961edc0df843961b6f1e8db44a0e0f8512 | |
parent | 829561c03cce4d2bfab18bba4e7e7b5351addcd3 (diff) |
Fix T66072: GPencil "stroke placement:surface" uses "stroke placement:stroke"s target parameters
The stroke parameters were used in Surface mode becaus ethe mode was not checked.
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 5 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index c5e91bd2cab..46a016b8c78 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1130,8 +1130,9 @@ static void gp_stroke_newfrombuffer(tGPsdata *p) } } else { - if ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_ENDPOINTS) || - (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_FIRST)) { + if ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) && + ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_ENDPOINTS) || + (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_FIRST))) { int first_valid = 0; int last_valid = 0; diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index b10801fc87f..21bee0a9d4e 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -770,8 +770,9 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) is_depth = false; } else { - if ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_ENDPOINTS) || - (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_FIRST)) { + if ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) && + ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_ENDPOINTS) || + (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_FIRST))) { int first_valid = 0; int last_valid = 0; |