diff --git a/doc/python_api/rst/info_gotcha.rst b/doc/python_api/rst/info_gotcha.rst index 235e0f71c2d..e60f1e256cd 100644 --- a/doc/python_api/rst/info_gotcha.rst +++ b/doc/python_api/rst/info_gotcha.rst @@ -130,7 +130,7 @@ In this situation you can... * Exit edit-mode before running the tool. * Explicitly update the mesh by calling :class:`bmesh.types.BMesh.to_mesh`. * Modify the script to support working on the edit-mode data directly, see: :mod:`bmesh.from_edit_mesh`. -* Report the context as incorrect and only allow the script to run when editmode is disabled. +* Report the context as incorrect and only allow the script to run outside edit-mode. .. _info_gotcha_mesh_faces: 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 */