[Bf-blender-cvs] [089c6d6] multiview: Fix for unfreed memory after bad merge (re: sequencer proxies)

Dalai Felinto noreply at git.blender.org
Wed Feb 4 20:09:06 CET 2015


Commit: 089c6d6694fe46c14144fa3786832c6f477edb8f
Author: Dalai Felinto
Date:   Wed Feb 4 17:06:37 2015 -0200
Branches: multiview
https://developer.blender.org/rB089c6d6694fe46c14144fa3786832c6f477edb8f

Fix for unfreed memory after bad merge (re: sequencer proxies)

===================================================================

M	source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 234320e..cd9e546 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3127,8 +3127,8 @@ monoview_image:
 						                             proxy_size);
 
 					/* fetching for requested proxy sze failed, try fetching the original isntead */
-					if (!ibuf && proxy_size != IMB_PROXY_NONE) {
-						ibuf = IMB_anim_absolute(sanim->anim, nr + seq->anim_startofs,
+					if (!ibuf_arr[i] && proxy_size != IMB_PROXY_NONE) {
+						ibuf_arr[i] = IMB_anim_absolute(sanim->anim, nr + seq->anim_startofs,
 						                         seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
 						                         IMB_PROXY_NONE);
 					}




More information about the Bf-blender-cvs mailing list