Bug fix: Rendering with anti-aliasing disabled and full samples enabled crashed
authorJanne Karhu <jhkarh@gmail.com>
Sat, 6 Nov 2010 21:32:58 +0000 (21:32 +0000)
committerJanne Karhu <jhkarh@gmail.com>
Sat, 6 Nov 2010 21:32:58 +0000 (21:32 +0000)
* Disabling anti-aliasing disables full samples in ui, so do that in render code too.

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

index c90d581ca010729a6e4544cdcbb11e58cb1f5c46..50fd5aba87bcda939fe20c5aa08e9b6e76f1e373 100644 (file)
@@ -1247,6 +1247,9 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *
                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 */