forked from bartvdbraak/blender
bugfix
- 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:
parent
a42c490a04
commit
a992fec4e7
@ -1979,8 +1979,14 @@ static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame
|
||||
ibuf= image_get_ibuf(ima, 0, frame);
|
||||
|
||||
/* XXX temp stuff? */
|
||||
if(ima->lastframe != frame)
|
||||
if(ima->lastframe != frame) {
|
||||
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;
|
||||
}
|
||||
else if(ima->type==IMA_TYPE_MULTILAYER) {
|
||||
|
@ -861,7 +861,7 @@ void GPU_free_images_anim(void)
|
||||
|
||||
if(G.main)
|
||||
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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user