[Bf-committers] Compile error OSX Leopard

[trip somewhere]

Sweet! I just dumped the entire src folder this time :P That did the trick.

I see what I did now, I altered the osa settings to give me a value of
1 and two as well as 5, but why did it not like my edit? It was one
single number change is all.



On 1/25/08, Ken Hughes <khughes at pacific.edu> wrote:
> I just svn updated and looked at the lines it's complaining about.  Line
> 1961 is this:
>
>     uiDefButS(block, ROW,B_DIFF,"5",
> 369,88,29,20,&G.scene->r.osa,2.0,5.0, 0, 0, "Render 5 samples per pixel
> for smooth edges (Fast)");
>
> so the copy in SVN doesn't contain anything like that.  Those errors
> usually indicate that when you did "svn update" your file was different
> from svn and the changes couldn't be merged, so it puts comments in the
> file to show what needs to be edited by hand.
>
> Did you look at the lines in question in you file?
>
> trip somewhere wrote:
> > Same error after removing the file and re svn'n
> >
> >
> > On Jan 25, 2008 12:12 PM, Ken Hughes <khughes at pacific.edu> wrote:
> >
> >> Try removing source/blender/src/buttons_scene.c, getting from svn again
> >> and rebuilding.
> >>
> >> Also, please only post the last few lines with the errors, not the
> >> entire build listing.
> >>
> >> Ken
> >>
> >> trip somewhere wrote:
> >>
> >>> source/blender/src/buttons_scene.c: In function 'render_panel_render':
> >>> source/blender/src/buttons_scene.c:1961: error: syntax error before '<<' token
> >>> source/blender/src/buttons_scene.c:1966: error: syntax error before '==' token
> >>> source/blender/src/buttons_scene.c:1971: error: syntax error before '>>' token
> >>> scons: *** [/Users/light/Blender/source/build/darwin/source/blender/src/buttons_scene.o]
> >>> Error 1
> >>>
> >>>
> >> _______________________________________________
> >> Bf-committers mailing list
> >> Bf-committers at blender.org
> >> http://lists.blender.org/mailman/listinfo/bf-committers
> >>
> >>
> > _______________________________________________
> > Bf-committers mailing list
> > Bf-committers at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-committers
> >
> >
>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>