diff options
author | Hans Goudey <h.goudey@me.com> | 2021-01-26 21:13:42 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-01-26 21:13:42 +0300 |
commit | cdb8209b35a198b078ff7cde4822ae0ff8440890 (patch) | |
tree | 582500eb9c38055d5579ef64d32dad5c1d5a6e06 /source/blender | |
parent | 3d7d0f1f2ef7c2e0a67308f6f18c6f18a7c4d798 (diff) | |
parent | d9a63d40e2dad80cea134d0cdfeda264c94ddb9e (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_fill.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index b8af8552a0d..8e17816dcc1 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -1154,8 +1154,8 @@ static int gpencil_points_from_stack(tGPDfill *tgpf) static void gpencil_stroke_from_buffer(tGPDfill *tgpf) { ToolSettings *ts = tgpf->scene->toolsettings; - const char *align_flag = &ts->gpencil_v3d_align; - const bool is_depth = (bool)(*align_flag & (GP_PROJECT_DEPTH_VIEW | GP_PROJECT_DEPTH_STROKE)); + const char align_flag = ts->gpencil_v3d_align; + const 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) && (tgpf->rv3d->persp == RV3D_CAMOB) && (!is_depth); Brush *brush = BKE_paint_brush(&ts->gp_paint->paint); @@ -1285,7 +1285,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf) } /* If camera view or view projection, reproject flat to view to avoid perspective effect. */ - if ((*p->align_flag & GP_PROJECT_VIEWSPACE) || is_camera) { + if ((align_flag & GP_PROJECT_VIEWSPACE) || is_camera) { ED_gpencil_project_stroke_to_view(tgpf->C, tgpf->gpl, gps); } diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 363d5d7ec17..3a0e1ce3d15 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -715,8 +715,8 @@ static void gpencil_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) bGPDstroke *gps = tgpi->gpf->strokes.first; GP_Sculpt_Settings *gset = &ts->gp_sculpt; 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 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); @@ -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 ((*p->align_flag & GP_PROJECT_VIEWSPACE) || is_camera) { + if ((align_flag & GP_PROJECT_VIEWSPACE) || is_camera) { ED_gpencil_project_stroke_to_view(C, tgpi->gpl, gps); } |