kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

I was impossible to set a render window back to being a non render window without changing the TexFace image.

Browse Source 
now the cross will unset the render window and use the texface if its there, cross again removes the image as useual.
This commit is contained in:
Campbell Barton 2006-10-22 12:46:54 +00:00
parent 0e569035c7
commit e459764b4b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/headerbuttons.c
View File

@ -1238,10 +1238,19 @@ void do_global_buttons(unsigned short event)
break;
case B_IMAGEDELETE:
G.sima->image= NULL;
image_changed(G.sima, 0);
BIF_undo_push("Unlink Image");
allqueue(REDRAWIMAGE, 0);
if(G.sima->image && BLI_streq(G.sima->image->id.name+2, "Render Result")==0) {
/* Run on non render images, unlink normally */
G.sima->image= NULL;
image_changed(G.sima, 0);
BIF_undo_push("Unlink Image");
allqueue(REDRAWIMAGE, 0);
} else {
/* Run if G.sima is render, remove the render and display the meshes image if it exists */
G.sima->image= NULL;
what_image(G.sima);
allqueue(REDRAWIMAGE, 0);
}
break;
case B_AUTOMATNAME: