[tuhopuu-devel] State of the merge

[Matt Ebb]

On 7 Feb 2005, at 8:45 AM, Chris Want wrote:

> The merge went pretty well, only one hiccup this time:
>
> ** source/blender/src/buttons_shading.c
>
> Matt and Jorge: Please check material_panel_flare() and
> in particular material_panel_shading() to ensure that your
> work is intact

Thanks, Chris! From what I can tell after a look through the source and 
also just using it, things seem to be ok to me here.

Cheers

Matt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2355 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/tuhopuu-devel/attachments/20050207/b47f2939/smime.bin