[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32896] trunk/blender/source/blender/ render/intern/source/pipeline.c: Bug fix: Rendering with anti-aliasing disabled and full samples enabled crashed

[Janne Karhu]

Revision: 32896
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32896
Author:   jhk
Date:     2010-11-06 22:32:58 +0100 (Sat, 06 Nov 2010)

Log Message:
-----------
Bug fix: Rendering with anti-aliasing disabled and full samples enabled crashed
* Disabling anti-aliasing disables full samples in ui, so do that in render code too.

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	2010-11-06 18:54:15 UTC (rev 32895)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-11-06 21:32:58 UTC (rev 32896)
@@ -1247,6 +1247,9 @@
 		return;
 	}
 
+	if((re->r.mode & (R_OSA))==0)
+		re->r.scemode &= ~R_FULL_SAMPLE;
+
 #ifdef WITH_OPENEXR
 	if(re->r.scemode & R_FULL_SAMPLE)
 		re->r.scemode |= R_EXR_TILE_FILE;	/* enable automatic */