Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-12-19 21:50:07 +0300
committerAntonioya <blendergit@gmail.com>2018-12-19 21:50:28 +0300
commit205b0d4651d866c45442acf7066eff276245efa9 (patch)
tree87911c6e3de85d039e9afa6061a777c8167f57eb /source/blender/editors/gpencil/gpencil_fill.c
parenta8198e6fbf6bc3ef870e89988593282489c011e4 (diff)
GP: Fix error drawing on Camera view for Surface/Stroke
This bug was introduced fixing task T59595
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_fill.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_fill.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 0e1a5e613b2..e4e71339560 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -820,7 +820,10 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
const int cfra_eval = (int)DEG_get_ctime(tgpf->depsgraph);
ToolSettings *ts = tgpf->scene->toolsettings;
- const bool is_camera = (bool)(ts->gp_sculpt.lock_axis == 0) && (tgpf->rv3d->persp == RV3D_CAMOB);
+ 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);
if (brush == NULL) {
return;