diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-22 05:58:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-22 05:58:07 +0400 |
| commit | 049b6cfa6ddcc44d8001804922f041367f3051c6 (patch) | |
| tree | c57f4aec1f85b037009036c22109b2a3330acdb3 /source/blender/render | |
| parent | 90db85a26301216d11c2adc956046b276ce8ef5f (diff) | |
Fix for image garbage collection failing to run for render-only views
Check for freeing old images was running per-object, move this to viewport drawing.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 597f93a2659..253f8a1383f 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -1132,7 +1132,9 @@ static int multitex(Tex *tex, float texvec[3], float dxt[3], float dyt[3], int o case TEX_IMAGE: if (osatex) retval = imagewraposa(tex, tex->ima, NULL, texvec, dxt, dyt, texres, pool); else retval = imagewrap(tex, tex->ima, NULL, texvec, texres, pool); - BKE_image_tag_time(tex->ima); /* tag image as having being used */ + if (tex->ima) { + BKE_image_tag_time(tex->ima); + } break; case TEX_ENVMAP: retval = envmaptex(tex, texvec, dxt, dyt, osatex, texres, pool); |