diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-12 07:37:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-12 07:37:28 +0400 |
| commit | 955b5db5e9840b597ed1d7e99825c17c3120295c (patch) | |
| tree | bd46cf307d7d724d13edec29ff0564e80b5c0389 /source | |
| parent | 5d8a207b67aee18cadec742246b9dc9c052bd344 (diff) | |
build fix: recent commit broke building on 64bit linux
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 9be7446677c..ad974e8b464 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -780,7 +780,7 @@ static short gp_stroke_eraser_splitdel(bGPDframe *gpf, bGPDstroke *gps, int i) float delta = pt_tmp[1].time; int j; - gps->inittime += delta; + gps->inittime += (double)delta; pts = gps->points; for (j = 0; j < gps->totpoints; j++, pts++) { @@ -817,7 +817,7 @@ static short gp_stroke_eraser_splitdel(bGPDframe *gpf, bGPDstroke *gps, int i) float delta = pt_tmp[i].time; int j; - gsn->inittime += delta; + gsn->inittime += (double)delta; pts = gsn->points; for (j = 0; j < gsn->totpoints; j++, pts++) { diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 4dc86d028f8..d4b1f9a3c47 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -56,10 +56,8 @@ typedef struct bGPDstroke { short thickness; /* thickness of stroke (currently not used) */ short flag; /* various settings about this stroke */ - - float pad; + double inittime; /* Init time of stroke */ - float pad2; } bGPDstroke; /* bGPDstroke->flag */ |