[Bf-blender-cvs] [e7bf6c6] soc-2016-cycles_denoising: Cycles: Fix post-processing not working again after it was cancelled before

[Lukas Stockner]

Commit: e7bf6c67b432d4dcd32f68d9306eb0273e1d0eca
Author: Lukas Stockner
Date:   Fri Nov 25 00:48:10 2016 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rBe7bf6c67b432d4dcd32f68d9306eb0273e1d0eca

Cycles: Fix post-processing not working again after it was cancelled before

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

M       source/blender/editors/space_image/image_ops.c

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

diff --git a/source/blender/editors/space_image/image_ops.c 
b/source/blender/editors/space_image/image_ops.c
index b7ebd12..64085bd 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -3759,6 +3759,8 @@ static int postprocess_exec(bContext *C, wmOperator 
*UNUSED(op))
        RenderResult *rr = BKE_image_acquire_renderresult(scene, ima);
        Render *re = RE_NewRender(scene->id.name);
 
+       G.is_break = false;
+
        RE_engine_postprocess(scene, re, rr);
 
        BKE_image_release_renderresult(scene, ima);
@@ -4074,6 +4076,7 @@ static int postprocess_invoke(bContext *C, wmOperator 
*op, const wmEvent *event)
        RE_progress_cb(re, job, postprocess_progress_update);
 
        op->customdata = rr;
+       G.is_break = false;
 
        WM_jobs_start(CTX_wm_manager(C), wm_job);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs