diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-28 16:14:30 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-28 16:14:30 +0400 |
| commit | 3fcc7095e876f8f3f9a857d02e72c36f36ba7846 (patch) | |
| tree | 8e2232c1aca73ab6fe3c5c9b0e503addde1f2c24 /source/blender/render | |
| parent | dfbc6213b5d45ec792e76edc13f8fdaf45015043 (diff) | |
Fix for bug #9687: crash with FSA when compiling with openexr support.
FSA requires exr, so I've disabled the buttons too in that case. I also
noticed CMake doesn't enable openexr by default, but a lot of the render
code relies on it, so I've enabled it by default now.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 2c6da8b2cb8..09c850b6252 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1081,6 +1081,10 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, int winx, int winy re->ok= 0; } else { +#ifndef WITH_OPENEXR + /* can't do this without openexr support */ + re->r.scemode &= ~R_EXR_TILE_FILE; +#endif if(!(re->r.scemode & R_EXR_TILE_FILE)) re->r.scemode &= ~R_FULL_SAMPLE; /* clear, so we can use this flag for test both */ |