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

bugfix

Browse Source 
- image filepath in the image view would only be set when first loading a frame.
- check to free animated image buffers on opengl render was comparing against the wrong value.
This commit is contained in:
Campbell Barton 2010-08-25 02:32:02 +00:00
parent a42c490a04
commit a992fec4e7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1979,8 +1979,14 @@ static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame
ibuf= image_get_ibuf(ima, 0, frame); ibuf= image_get_ibuf(ima, 0, frame);
/* XXX temp stuff? */ /* XXX temp stuff? */
if(ima->lastframe != frame) if(ima->lastframe != frame) {
ima->tpageflag |= IMA_TPAGE_REFRESH; ima->tpageflag |= IMA_TPAGE_REFRESH;
if(ibuf) {
/* without this the image name only updates
* on first load which is quite confusing */
BLI_strncpy(ima->name, ibuf->name, sizeof(ima->name));
}
}
ima->lastframe = frame; ima->lastframe = frame;
} }
else if(ima->type==IMA_TYPE_MULTILAYER) { else if(ima->type==IMA_TYPE_MULTILAYER) {

2
source/blender/gpu/intern/gpu_draw.c
View File

@ -861,7 +861,7 @@ void GPU_free_images_anim(void)
if(G.main) if(G.main)
for(ima=G.main->image.first; ima; ima=ima->id.next) for(ima=G.main->image.first; ima; ima=ima->id.next)
if(ELEM(ima->type, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) if(ELEM(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE))
GPU_free_image(ima); GPU_free_image(ima);
} }