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

Fix drawing annotations on surface

Browse Source 
Caused by {rBaa0ac0035a0d}.

Similar solution to {rBc0fdaf700a5}.
This commit is contained in:
Germano Cavalcante
2021-11-29 09:43:33 -03:00
parent 7c703b4699
commit 6ae34bb071
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1666,6 +1666,7 @@ static void annotation_paint_initstroke(tGPsdata *p,
static void annotation_paint_strokeend(tGPsdata *p) static void annotation_paint_strokeend(tGPsdata *p)
{ {
ToolSettings *ts = p->scene->toolsettings; ToolSettings *ts = p->scene->toolsettings;
const bool is_eraser = (p->gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) != 0;
/* for surface sketching, need to set the right OpenGL context stuff so that /* for surface sketching, need to set the right OpenGL context stuff so that
* the conversions will project the values correctly... * the conversions will project the values correctly...
*/ */
@@ -1681,11 +1682,11 @@ static void annotation_paint_strokeend(tGPsdata *p)
(ts->annotate_v3d_align & GP_PROJECT_DEPTH_STROKE) ? (ts->annotate_v3d_align & GP_PROJECT_DEPTH_STROKE) ?
V3D_DEPTH_GPENCIL_ONLY : V3D_DEPTH_GPENCIL_ONLY :
V3D_DEPTH_NO_GPENCIL, V3D_DEPTH_NO_GPENCIL,
NULL); is_eraser ? NULL : &p->depths);
} }
/* check if doing eraser or not */ /* check if doing eraser or not */
if ((p->gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) == 0) { if (!is_eraser) {
/* transfer stroke to frame */ /* transfer stroke to frame */
annotation_stroke_newfrombuffer(p); annotation_stroke_newfrombuffer(p);
} }