diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-12-16 16:43:20 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-12-16 16:43:20 +0300 |
| commit | 919d3413216818ef794dc897831d39059ac73f16 (patch) | |
| tree | 3bf2d7e03a2c1131212e2e8515da83c81cdf2ed6 /source/blender/blenkernel/intern/image.c | |
| parent | 4e26b4ec38aa62959951e2edb488661e6245ba96 (diff) | |
Bugfix #24976 revisited
Multi-layer images: clicking on the "Source" popup freed all memory
for multilayers, even when choosing the same "File" entry again.
Now it should work :)
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 4a40982b62e..f2a100134b3 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1440,7 +1440,9 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) } } - image_free_buffers(ima); + /* force reload on first use, but not for multilayer, that makes nodes and buttons in ui drawing fail */ + if(ima->type!=IMA_TYPE_MULTILAYER) + image_free_buffers(ima); ima->ok= 1; if(iuser) |