Merging r49681 through r49707 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / render / render_internal.c
index b17768949596dd4a573ed5ed736fa6a2e4223794..87d2c79d28faefbebb70b8a501e19dc66304a863 100644 (file)
@@ -61,6 +61,7 @@
 #include "ED_object.h"
 
 #include "RE_pipeline.h"
+#include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
@@ -150,6 +151,9 @@ void image_buffer_rect_update(Scene *scene, RenderResult *rr, ImBuf *ibuf, volat
        IMB_buffer_byte_from_float(rectc, rectf,
                                   4, ibuf->dither, IB_PROFILE_SRGB, profile_from, predivide,
                                   xmax, ymax, ibuf->x, rr->rectx);
+
+       IMB_partial_display_buffer_update(ibuf, rectf, rr->rectx, rxmin, rymin,
+                                         rxmin, rymin, rxmin + xmax, rymin + ymax);
 }
 
 /* ****************************** render invoking ***************** */
@@ -224,7 +228,7 @@ static int screen_render_exec(bContext *C, wmOperator *op)
         * otherwise, invalidated cache entries can make their way into
         * the output rendering. We can't put that into RE_BlenderFrame,
         * since sequence rendering can call that recursively... (peter) */
-       seq_stripelem_cache_cleanup();
+       BKE_sequencer_cache_cleanup();
 
        RE_SetReports(re, op->reports);
 
@@ -526,7 +530,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
         * otherwise, invalidated cache entries can make their way into
         * the output rendering. We can't put that into RE_BlenderFrame,
         * since sequence rendering can call that recursively... (peter) */
-       seq_stripelem_cache_cleanup();
+       BKE_sequencer_cache_cleanup();
 
        /* get editmode results */
        ED_object_exit_editmode(C, 0);  /* 0 = does not exit editmode */