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

Bugfix #5217

Browse Source 
Call to refresh Image Icon on load should not be done for background
renders... crashed blender then.
This commit is contained in:
Ton Roosendaal 2006-11-13 13:32:52 +00:00
parent 41b84e4ef0
commit 6c941bb3e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/image.c
View File

@ -590,7 +590,7 @@ void load_image(Image * ima, int flags, char *relabase, int framenum)
if (ima->ibuf) { if (ima->ibuf) {
detectBitmapFont(ima->ibuf); detectBitmapFont(ima->ibuf);
/* preview is NULL when it has never been used as an icon before */ /* preview is NULL when it has never been used as an icon before */
if(ima->preview==NULL) if(G.background==0 && ima->preview==NULL)
BKE_icon_changed(BKE_icon_getid(&ima->id)); BKE_icon_changed(BKE_icon_getid(&ima->id));
} }