[tuhopuu-devel] State of the merge
Chris Want
tuhopuu-devel@blender.org
Sat, 06 Mar 2004 10:13:18 -0700
OK, that didn't go as well as I had hoped -- 306 conflicts.
* Just about every Sconscript had conflicts.
I don't have time to debug Scons (I don't understand
it) so I have just copied the conflicting sconscripts
from bf-blender to tuhopuu (the support in bf-blender
seems to be better developed).
* A lot of files in extern/solid had a lot of weird
little conflicts. Rather than scrutinize the problems,
I opted to just keep the extern/solid files from tuhopuu2
(I think they were updated more recently than the bf-blender
files)
* The autoconf stuff went bye-bye. If you still use
autoconf to build blender, feel free to re-add it.
Other than that, the parts of blender/tuhopuu2 that actually
involved real code merged very smoothly.
Please test and report any problems here.
Regards,
Chris