build fix: recent commit broke building on 64bit linux
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Nov 2012 03:37:28 +0000 (03:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Nov 2012 03:37:28 +0000 (03:37 +0000)
doc/python_api/rst/info_gotcha.rst
source/blender/editors/gpencil/gpencil_paint.c
source/blender/makesdna/DNA_gpencil_types.h

index 235e0f71c2d5ab044092d66d6638a63c568863c6..e60f1e256cd0ea271799b5c9934a6f23d4fc9193 100644 (file)
@@ -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:
index 9be7446677c59867c22617ed655bc89ceb067552..ad974e8b4640691b502869d2a83243b2fef84305 100644 (file)
@@ -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++) {
index 4dc86d028f87b20524e81275f8c1f07ed9c4c022..d4b1f9a3c47845ff334cd27dafad4efa5ea41d75 100644 (file)
@@ -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 */