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

Bugfix #24976 revisited

Browse Source 
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 :)
This commit is contained in:
Ton Roosendaal 2010-12-16 13:43:20 +00:00
parent 4e26b4ec38
commit 919d341321
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

3
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -318,8 +318,7 @@ static void rna_Node_image_layer_update(Main *bmain, Scene *scene, PointerRNA *p
ImageUser *iuser= node->storage;
BKE_image_multilayer_index(ima->rr, iuser);
/* do not call below function, it frees the multilayer exr */
/* BKE_image_signal(ima, iuser, IMA_SIGNAL_SRC_CHANGE); */
BKE_image_signal(ima, iuser, IMA_SIGNAL_SRC_CHANGE);
rna_Node_update(bmain, scene, ptr);
}