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

[Dalai Felinto]

Commit: fb01c00286ee3669ca62453efc183f235d1cd615
Author: Dalai Felinto
Date:   Wed Nov 26 16:57:02 2014 -0200
Branches: multiview
https://developer.blender.org/rBfb01c00286ee3669ca62453efc183f235d1cd615

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

Conflicts:
	source/blender/editors/space_view3d/view3d_draw.c

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



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

diff --cc source/blender/editors/space_view3d/view3d_draw.c
index 533aa50,bc5ef14..5e3ab28
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -3034,7 -3033,9 +3058,13 @@@ void ED_view3d_draw_offscreen(Scene *sc
  		 * warning! can be slow so only free animated images - campbell */
  		GPU_free_images_anim();
  	}
 +
+ 	/* setup view matrices */
 -	view3d_main_area_setup_view(scene, v3d, ar, viewmat, winmat);
 -	
++	if ((viewname != NULL) && (viewmat == NULL))
++		view3d_stereo3d_setup_offscreen(scene, v3d, ar, winmat, viewname);
++	else
++		view3d_main_area_setup_view(scene, v3d, ar, viewmat, winmat);
++
  	/* clear opengl buffers */
  	if (do_sky) {
  		view3d_main_area_clear(scene, v3d, ar, true);