[tuhopuu-devel] State of the merge

[ricki myers]

Ok Fixed DNA and do_brackets

still getting a error

/tuhopuu3/obj/linux-glibc2.3.3-i386/blender/src/libsrcpublisher.a(editobject.o)(.text+0x494a):
In function `convertmenu':
/home/rick/blender/tuhopuu/tuhopuu3/source/blender/src/editobject.c:2395:
undefined reference to `transform'

On 5/1/05, ricki myers <antihc3 at gmail.com> wrote:
> I Forgot to get with kaito about the theme stuff so it looks as if
> kaito has made some changes in BF
> I will check out the rest
> 
> 
> On 5/1/05, Chris Want <cwant at ualberta.ca> wrote:
> > Well, just in time to destroy what Matt did yesterday. ;)
> > This week wasn't too bad (famous last words), here are some
> > items that may need to be checked:
> >
> > readfile.c: A conflict in do_versions() related to passepartout.
> >     The code looked a bit odd so I modified it... I hope it
> >     still works in the manner it was intended.
> >
> > BIF_resources.h: enum involving themes and text brackets had a conflict.
> >     The comment says "WARNING: this is saved in file, so do not change
> >     order!" ... but I have no choice since TH_BRACKET will be in a
> >     different order in both trees. If the theme stuff needs an enum to
> >     be in a certain order, then this is a truly suboptimal design, and
> >     I would recommend that at the very least that the enum entries be
> >     given specific values (this applies to both trees).
> >
> >
> > DNA_userdef_types.h: bracket matching created conflict that was
> >     fairly easy to fix. The only reason I'm mentioning this here
> >     is that I suck at the whole 'DNA padding' thing, so I may
> >     have screwed this up.
> > _______________________________________________
> > tuhopuu-devel mailing list
> > tuhopuu-devel at projects.blender.org
> > http://projects.blender.org/mailman/listinfo/tuhopuu-devel
> >
> 
> --
> antihc3 a.k.a Rick
> 


-- 
antihc3 a.k.a Rick