[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13989] trunk/blender/source/blender/ render/intern/source/pipeline.c: FSA fix:

[Ton Roosendaal]

Revision: 13989
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13989
Author:   ton
Date:     2008-03-06 20:26:44 +0100 (Thu, 06 Mar 2008)

Log Message:
-----------
FSA fix:

If you composite using multiple scenes, the "use FSA" button had to be set
or disabled for each scene. Now you can just set/disable FSA for the scene 
that does the compositing. You can only disable FSA in other scenes if it 
was set before though.

(Any understands these lines? :)

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2008-03-06 10:02:25 UTC (rev 13988)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2008-03-06 19:26:44 UTC (rev 13989)
@@ -1086,8 +1086,12 @@
 			re->r.scemode &= ~R_FULL_SAMPLE;	/* clear, so we can use this flag for test both */
 		
 		/* fullsample wants uniform osa levels */
-		if(source && re->r.scemode & R_FULL_SAMPLE) {
-			re->r.osa= re->osa= source->osa;
+		if(source && (re->r.scemode & R_FULL_SAMPLE)) {
+			/* but, if source has no full sample we disable it */
+			if((source->r.scemode & R_FULL_SAMPLE)==0)
+				re->r.scemode &= ~R_FULL_SAMPLE;
+			else
+				re->r.osa= re->osa= source->osa;
 		}
 		else {
 			/* check state variables, osa? */