Revision: 33711
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33711
Author: ton
Date: 2010-12-16 14:43:20 +0100 (Thu, 16 Dec 2010)
Log Message:
-----------
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 :)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2010-12-16
12:49:48 UTC (rev 33710)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2010-12-16
13:43:20 UTC (rev 33711)
@@ -1440,7 +1440,9 @@
}
}
- 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)
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2010-12-16
12:49:48 UTC (rev 33710)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2010-12-16
13:43:20 UTC (rev 33711)
@@ -318,8 +318,7 @@
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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
