OK, Here's the damage: buttons_shading.c: Matt, please check texture_panel_image(). This is a mashing together of code from both trees. The texture_type_menu() function seems to be the source of some problems. If you like this function, you might want to add something similar to the bf tree to avoid future merge problems. Chris