blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T62140: GPencil line segment disappears 

Remove code for when edge count is 2.
This commit is contained in:
Charlie Jolly 2019-03-04 12:13:35 +00:00
parent baee9b014a
commit ae74f89585
Notes: blender-bot 2023-02-14 03:30:45 +01:00 
Referenced by issue #62181, Crash when opening the `mr_elephant` file.
Referenced by issue #62140, line segment disappears when using extrude of predefined grease pencil line stroke
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,26 +522,16 @@ static void gp_primitive_rectangle(tGPDprimitive *tgpi, tGPspoint *points2D)
/* create a line */
static void gp_primitive_line(tGPDprimitive *tgpi, tGPspoint *points2D)
{
if (tgpi->tot_edges == 2) {
int i = tgpi->tot_stored_edges;
const int totpoints = (tgpi->tot_edges + tgpi->tot_stored_edges);
const float step = 1.0f / (float)(tgpi->tot_edges - 1);
float a = tgpi->tot_stored_edges ? step : 0.0f;
points2D[i].x = tgpi->start[0];
points2D[i].y = tgpi->start[1];
points2D[i + 1].x = tgpi->end[0];
points2D[i + 1].y = tgpi->end[1];
}
else {
const int totpoints = (tgpi->tot_edges + tgpi->tot_stored_edges);
const float step = 1.0f / (float)(tgpi->tot_edges - 1);
float a = tgpi->tot_stored_edges ? step : 0.0f;
for (int i = tgpi->tot_stored_edges; i < totpoints; i++) {
tGPspoint *p2d = &points2D[i];
interp_v2_v2v2(&p2d->x, tgpi->start, tgpi->end, a);
a += step;
}
for (int i = tgpi->tot_stored_edges; i < totpoints; i++) {
tGPspoint *p2d = &points2D[i];
interp_v2_v2v2(&p2d->x, tgpi->start, tgpi->end, a);
a += step;
}
float color[4];
UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color);
gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL);