archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T66072: GPencil "stroke placement:surface" uses "stroke placement:stroke"s target parameters

Browse Source 
The stroke parameters were used in Surface mode becaus ethe mode was not checked.
This commit is contained in:
Antonio Vazquez
2019-06-24 10:14:39 +02:00
parent 829561c03c
commit 3fb099bf81
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/gpencil/gpencil_paint.c
View File

@@ -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;

5
source/blender/editors/gpencil/gpencil_primitive.c
View File

@@ -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;