Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GP: Cleanup retiming to do in same loop

Browse Source
This commit is contained in:
Antonioya
2019-02-01 17:14:28 +01:00
parent fdc12395c3
commit b8e409ba98
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/gpencil/gpencil_edit.c
View File

@@ -1828,6 +1828,8 @@ static void gp_stroke_join_islands(bGPDframe *gpf, bGPDstroke *gps_first, bGPDst
/* copy points (last before) */ /* copy points (last before) */
int e1 = 0; int e1 = 0;
int e2 = 0; int e2 = 0;
float delta = 0.0f;
for (int i = 0; i < totpoints; i++) { for (int i = 0; i < totpoints; i++) {
pt_final = &join_stroke->points[i]; pt_final = &join_stroke->points[i];
if (i < gps_last->totpoints) { if (i < gps_last->totpoints) {
@@ -1843,8 +1845,11 @@ static void gp_stroke_join_islands(bGPDframe *gpf, bGPDstroke *gps_first, bGPDst
copy_v3_v3(&pt_final->x, &pt->x); copy_v3_v3(&pt_final->x, &pt->x);
pt_final->pressure = pt->pressure; pt_final->pressure = pt->pressure;
pt_final->strength = pt->strength; pt_final->strength = pt->strength;
pt_final->time = pt->time; pt_final->time = delta;
pt_final->flag = pt->flag; pt_final->flag = pt->flag;
/* retiming with fixed time interval (we cannot determine real time) */
delta += 0.01f;
} }
/* Copy over vertex weight data (if available) */ /* Copy over vertex weight data (if available) */
@@ -1878,19 +1883,6 @@ static void gp_stroke_join_islands(bGPDframe *gpf, bGPDstroke *gps_first, bGPDst
} }
} }
/* retiming with fixed time interval */
{
float delta = 0.0f;
int j;
join_stroke->inittime = (double)delta;
pt = join_stroke->points;
for (j = 0; j < join_stroke->totpoints; j++, pt++) {
pt->time = delta;
delta += 0.01f;
}
}
/* add new stroke at head */ /* add new stroke at head */
BLI_addhead(&gpf->strokes, join_stroke); BLI_addhead(&gpf->strokes, join_stroke);