[Bf-blender-cvs] [f9cb232] multiview: Merge remote-tracking branch 'origin/master' into multiview

[Dalai Felinto]

Commit: f9cb2328514b94a22443fad2032c29a17370cd27
Author: Dalai Felinto
Date:   Mon Sep 22 23:10:01 2014 +0200
Branches: multiview
https://developer.blender.org/rBf9cb2328514b94a22443fad2032c29a17370cd27

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
	source/blender/render/intern/source/pipeline.c

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



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

diff --cc source/blender/render/intern/source/pipeline.c
index f47f681,7e6d212..e724f08
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@@ -1749,7 -1663,12 +1753,12 @@@ static void do_render_fields_blur_3d(Re
  				BLI_rw_mutex_unlock(&re->resultmutex);
  		
  				re->display_init(re->dih, re->result);
 -				re->display_update(re->duh, re->result, NULL);
 +				re->display_update(re->duh, re->result, NULL, re->viewname);
+ 
+ 				/* restore the disprect from border */
+ 				re->disprect = orig_disprect;
+ 				re->rectx = orig_rectx;
+ 				re->recty = orig_recty;
  			}
  			else {
  				/* set offset (again) for use in compositor, disprect was manipulated. */