[Bf-blender-cvs] [04c0a46] master: Fix T42408: FSAA affects Cycles Image Compositing

[Sergey Sharybin]

Commit: 04c0a46570efa1d8154a573663c77a49af32cb93
Author: Sergey Sharybin
Date:   Tue Nov 4 20:41:12 2014 +0500
Branches: master
https://developer.blender.org/rB04c0a46570efa1d8154a573663c77a49af32cb93

Fix T42408: FSAA affects Cycles Image Compositing

Use FSAA settings only if current render engine is BI or GE/

That's for until we'll support FSAA in Cycles or other render engines.

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

M	source/blender/render/intern/source/pipeline.c

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

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index c112f3d..741cfe2 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -492,6 +492,12 @@ static int check_mode_full_sample(RenderData *rd)
 {
 	int scemode = rd->scemode;
 
+	if (!STREQ(rd->engine, RE_engine_id_BLENDER_RENDER) &&
+	    !STREQ(rd->engine, RE_engine_id_BLENDER_GAME))
+	{
+		scemode &= ~R_FULL_SAMPLE;
+	}
+
 	if ((rd->mode & R_OSA) == 0)
 		scemode &= ~R_FULL_SAMPLE;