[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19893] trunk/blender/source/blender/src/ sequence.c: == SEQUENCER ==

[Peter Schlaile]

Revision: 19893
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19893
Author:   schlaile
Date:     2009-04-23 08:07:51 +0200 (Thu, 23 Apr 2009)

Log Message:
-----------
== SEQUENCER ==

This fixes 

[#18079] Sequencer color correction does not apply on float image if "make float" is not applied

and closes

[#18582] bug fix #18079

by removing ibuf->rect on image load if ibuf->rect_float is used.
(Don't know, why the OpenEXR loader does that, but I fix this on sequencer
side for now...)
 

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2009-04-23 05:56:09 UTC (rev 19892)
+++ trunk/blender/source/blender/src/sequence.c	2009-04-23 06:07:51 UTC (rev 19893)
@@ -1761,6 +1761,11 @@
 			if (!se->ibuf) {
 				se->ibuf= IMB_loadiffname(
 					name, IB_rect);
+				/* we don't need both (speed reasons)! */
+				if (se->ibuf->rect_float && se->ibuf->rect) {
+					imb_freerectImBuf(se->ibuf);
+				}
+
 				copy_to_ibuf_still(seq, se);
 			}
 			
@@ -1791,6 +1796,12 @@
 				if(seq->anim) {
 					IMB_anim_set_preseek(seq->anim, seq->anim_preseek);
 					se->ibuf = IMB_anim_absolute(seq->anim, se->nr + seq->anim_startofs);
+					/* we don't need both (speed reasons)! */
+					if (se->ibuf->rect_float 
+					    && se->ibuf->rect) {
+						imb_freerectImBuf(se->ibuf);
+					}
+
 				}
 				copy_to_ibuf_still(seq, se);
 			}