[tuhopuu-devel] State of the merge

[joeedh]

Chris Want wrote:

> Fairly smooth merge. Here are the things that make poor
> ol' Hos'  hair turn grey:
>
> buttons_scene.c:
>
> * check render_panel_output(), went with tuhopuu code for conflict
> as the stuff that was showing up from bf (backbuf, threads, etc)
> seems to all be spread out in other places.
>
> * check render_panels(), I mixed the two versions from tuho/bf
> (e.g., bf had render_panel_anim() and render_panel_format() included
> also).
>
> buttons_shading.c:
>
> * flare panel may be shmushed.
>
> * ramps/tramir panels may be shmushed
>
> Chris

Thanks for the merge!!!

and also thanks for changing those hemesh extrusion transform calls!

joeedh