Hi Cambo, Unfortunately, by reverting the fix, you've now re-broken compiling on 32 bit windows
On Mon, Nov 12, 2012 at 4:56 PM, Daniel Salazar - 3Developer.com <[email protected]> wrote: > Hi Cambo, Unfortunately building is still failing here > > http://www.pasteall.org/37134 > > Daniel Salazar > patazstudio.com > > > On Sun, Nov 11, 2012 at 9:37 PM, Campbell Barton <[email protected]>wrote: > >> Revision: 52130 >> >> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52130 >> Author: campbellbarton >> Date: 2012-11-12 03:37:28 +0000 (Mon, 12 Nov 2012) >> Log Message: >> ----------- >> build fix: recent commit broke building on 64bit linux >> >> Modified Paths: >> -------------- >> trunk/blender/doc/python_api/rst/info_gotcha.rst >> trunk/blender/source/blender/editors/gpencil/gpencil_paint.c >> trunk/blender/source/blender/makesdna/DNA_gpencil_types.h >> >> Modified: trunk/blender/doc/python_api/rst/info_gotcha.rst >> =================================================================== >> --- trunk/blender/doc/python_api/rst/info_gotcha.rst 2012-11-12 >> 03:26:40 UTC (rev 52129) >> +++ trunk/blender/doc/python_api/rst/info_gotcha.rst 2012-11-12 >> 03:37:28 UTC (rev 52130) >> @@ -130,7 +130,7 @@ >> * 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: >> >> Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c >> =================================================================== >> --- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c >> 2012-11-12 03:26:40 UTC (rev 52129) >> +++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c >> 2012-11-12 03:37:28 UTC (rev 52130) >> @@ -780,7 +780,7 @@ >> 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 @@ >> 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++) { >> >> Modified: trunk/blender/source/blender/makesdna/DNA_gpencil_types.h >> =================================================================== >> --- trunk/blender/source/blender/makesdna/DNA_gpencil_types.h 2012-11-12 >> 03:26:40 UTC (rev 52129) >> +++ trunk/blender/source/blender/makesdna/DNA_gpencil_types.h 2012-11-12 >> 03:37:28 UTC (rev 52130) >> @@ -56,10 +56,8 @@ >> >> 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 */ >> >> _______________________________________________ >> Bf-blender-cvs mailing list >> [email protected] >> http://lists.blender.org/mailman/listinfo/bf-blender-cvs >> > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
