blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

GP: Recalc UV data for primitive strokes 

The data was not caculated when complete a primitive and it was only updated when use Edit mode.
This commit is contained in:
Antonio Vazquez 2019-01-22 17:54:19 +01:00
parent 63729bc11f
commit 25889423d3
Notes: blender-bot 2023-02-14 04:20:36 +01:00 
Referenced by issue #60766, Modal keymap customization from an addon is not restored properly
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/gpencil/gpencil_intern.h
View File

@ -236,6 +236,9 @@ typedef struct tGPDprimitive {
/** numeric input */
NumInput num;
/** size in pixels for uv calculation */
float totpixlen;
} tGPDprimitive;

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

@ -925,7 +925,36 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
tpt->pressure = pressure;
tpt->strength = strength;
tpt->time = p2d->time;
tpt->uv_fac = 1.0f;
/* point uv (only 3d view) */
if (gpd->runtime.sbuffer_size > 1) {
MaterialGPencilStyle *gp_style = tgpi->mat->gp_style;
const float pixsize = gp_style->texture_pixsize / 1000000.0f;
tGPspoint *tptb = (tGPspoint *)gpd->runtime.sbuffer + gpd->runtime.sbuffer_size - 2;
bGPDspoint spt, spt2;
/* get origin to reproject point */
float origin[3];
ED_gp_get_drawing_reference(tgpi->scene, tgpi->ob, tgpi->gpl,
ts->gpencil_v3d_align, origin);
/* reproject current */
ED_gpencil_tpoint_to_point(tgpi->ar, origin, tpt, &spt);
ED_gp_project_point_to_plane(tgpi->ob, tgpi->rv3d, origin, tgpi->lock_axis - 1, &spt);
/* reproject previous */
ED_gpencil_tpoint_to_point(tgpi->ar, origin, tptb, &spt2);
ED_gp_project_point_to_plane(tgpi->ob, tgpi->rv3d, origin, tgpi->lock_axis - 1, &spt2);
tgpi->totpixlen += len_v3v3(&spt.x, &spt2.x) / pixsize;
tpt->uv_fac = tgpi->totpixlen;
if ((gp_style) && (gp_style->sima)) {
tpt->uv_fac /= gp_style->sima->gen_x;
}
}
else {
tgpi->totpixlen = 0.0f;
tpt->uv_fac = 0.0f;
}
tpt->uv_rot = p2d->uv_rot;
gpd->runtime.sbuffer_size++;
@ -945,7 +974,7 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
pt->strength = strength;
pt->time = 0.0f;
pt->flag = 0;
pt->uv_fac = 1.0f;
pt->uv_fac = tpt->uv_fac;
if (gps->dvert != NULL) {
MDeformVert *dvert = &gps->dvert[i];
@ -1217,6 +1246,9 @@ static void gpencil_primitive_interaction_end(bContext *C, wmOperator *op, wmWin
gps->thickness = tgpi->brush->size;
gps->flag |= GP_STROKE_RECALC_GEOMETRY;
gps->tot_triangles = 0;
/* calculate UVs along the stroke */
ED_gpencil_calc_stroke_uv(tgpi->ob, gps);
}
/* transfer stroke from temporary buffer to the actual frame */