- fixed bug #384

browsing new texture for lamp in texturebuttons (f6) only gave 'add new'
  option.
- saving images in texturepaint mode saves in same format only. this is
  far from an easy fix to use the scene settings, so it indicates with
  saving clearly its in the same type now

source/blender/src/header_image.c

@@ -342,8 +342,7 @@ void do_image_buttons(unsigned short event)
 		if (ima) {
 			strcpy(name, ima->name);
 			if (ima->ibuf) {
-				save_image_filesel_str(str);
-				activate_fileselect(FILE_SPECIAL, str, name, save_paint);
+				activate_fileselect(FILE_SPECIAL, "Save in same type", name, save_paint);
 			}
 		}
 		break;

source/blender/src/headerbuttons.c

@@ -288,7 +288,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco,
 				if(browse==B_WORLDBROWSE) {
 					id= G.main->world.first;
 				}
-				else if(ob && ob->type && (ob->type<OB_LAMP)) {
+				else if(ob && ob->type && (ob->type<=OB_LAMP)) {
 					if(G.buts->mainb==CONTEXT_SHADING) {
 						int tab= G.buts->tab[CONTEXT_SHADING];