From 9caa2fee8e5365d5dcdeeb89bc160a3f15ef8daf Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 8 Nov 2003 10:02:30 +0000 Subject: [PATCH] - 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 | 3 +-- source/blender/src/headerbuttons.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 1a4f3dfa37b..1a02838a20b 100644 --- a/source/blender/src/header_image.c +++ b/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; diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index 696e60aeb3d..29b403a359d 100644 --- a/source/blender/src/headerbuttons.c +++ b/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->typetype && (ob->type<=OB_LAMP)) { if(G.buts->mainb==CONTEXT_SHADING) { int tab= G.buts->tab[CONTEXT_SHADING];