Another tester reported the same build failure in X11 ghost, and I'll issue a fix momentarily. Something from yesterday's trunk --> branch merge got crossed.
Mike Erwin musician, naturalist, pixel pusher, hacker extraordinaire On Thu, Jul 21, 2011 at 7:54 PM, Daniel Salazar - 3Developer.com <zan...@gmail.com> wrote: > And after disabling itasc it fails on spacenav related code > > http://www.pasteall.org/23409 > > Daniel Salazar > 3Developer.com > > > > On Thu, Jul 21, 2011 at 6:44 PM, Daniel Salazar - 3Developer.com > <zan...@gmail.com> wrote: >> This branch is failing to build (cmake) with itasc >> >> http://www.pasteall.org/23408 >> >> Daniel Salazar >> 3Developer.com >> >> >> >> On Thu, Jul 21, 2011 at 4:26 PM, Nathan Letwory >> <nat...@letworyinteractive.com> wrote: >>> Revision: 38593 >>> >>> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38593 >>> Author: jesterking >>> Date: 2011-07-21 22:26:58 +0000 (Thu, 21 Jul 2011) >>> Log Message: >>> ----------- >>> Show NDOF sensitivity field in userprefs >>> >>> Modified Paths: >>> -------------- >>> branches/merwin-spacenav/release/scripts/startup/bl_ui/space_userpref.py >>> >>> Modified: >>> branches/merwin-spacenav/release/scripts/startup/bl_ui/space_userpref.py >>> =================================================================== >>> --- >>> branches/merwin-spacenav/release/scripts/startup/bl_ui/space_userpref.py >>> 2011-07-21 21:43:42 UTC (rev 38592) >>> +++ >>> branches/merwin-spacenav/release/scripts/startup/bl_ui/space_userpref.py >>> 2011-07-21 22:26:58 UTC (rev 38593) >>> @@ -817,12 +817,9 @@ >>> #sub.prop(view, "wheel_scroll_lines", text="Scroll Lines") >>> >>> col.separator() >>> - ''' not implemented yet >>> sub = col.column() >>> sub.label(text="NDOF Device:") >>> - sub.prop(inputs, "ndof_pan_speed", text="Pan Speed") >>> - sub.prop(inputs, "ndof_rotate_speed", text="Orbit Speed") >>> - ''' >>> + sub.prop(inputs, "ndof_sensitivity", text="NDOF Sensitivity") >>> >>> row.separator() >>> >>> >>> _______________________________________________ >>> Bf-blender-cvs mailing list >>> bf-blender-...@blender.org >>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs >>> >> > _______________________________________________ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers