Revision: 14592
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14592
Author: blendix
Date: 2008-04-28 14:14:30 +0200 (Mon, 28 Apr 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/src/buttons_scene.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2008-04-28 11:40:38 UTC (rev 14591)
+++ trunk/blender/CMakeLists.txt 2008-04-28 12:14:30 UTC (rev 14592)
@@ -60,7 +60,7 @@
OPTION(WITH_VERSE "Enable Verse (http://verse.blender.org)"
OFF)
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)"
ON)
OPTION(WITH_QUICKTIME "Enable Quicktime Support"
OFF)
-OPTION(WITH_OPENEXR "Enable OpenEXR Support
(http://www.openexr.com)" OFF)
+OPTION(WITH_OPENEXR "Enable OpenEXR Support
(http://www.openexr.com)" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)"
ON)
OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms"
OFF)
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2008-04-28 11:40:38 UTC (rev 14591)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2008-04-28 12:14:30 UTC (rev 14592)
@@ -1081,6 +1081,10 @@
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 */
Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c 2008-04-28 11:40:38 UTC
(rev 14591)
+++ trunk/blender/source/blender/src/buttons_scene.c 2008-04-28 12:14:30 UTC
(rev 14592)
@@ -2043,12 +2043,15 @@
for(b=2; b>=0; b--)
for(a=0; a<3; a++)
uiDefButBitS(block, TOG, 1<<(3*b+a), 800,"",
(short)(10+18*a),(short)(10+14*b),16,12, &G.winpos, 0, 0, 0, 0, "Render window
placement on screen");
+ uiBlockEndAlign(block);
+#ifdef WITH_OPENEXR
uiBlockBeginAlign(block);
uiDefButBitI(block, TOG, R_EXR_TILE_FILE, B_REDR, "Save Buffers", 72,
31, 120, 19, &G.scene->r.scemode, 0.0, 0.0, 0, 0, "Save tiles for all
RenderLayers and used SceneNodes to files in the temp directory (saves memory,
allows Full Sampling)");
if(G.scene->r.scemode & R_EXR_TILE_FILE)
uiDefButBitI(block, TOG, R_FULL_SAMPLE, B_REDR, "FullSample",
192, 31, 118, 19, &G.scene->r.scemode, 0.0, 0.0, 0, 0, "Saves for every OSA
sample the entire RenderLayer results (Higher quality sampling but slower)");
uiBlockEndAlign(block);
+#endif
uiDefButS(block, MENU, B_REDR, "Render Display %t|Render Window
%x1|Image Editor %x0|Full Screen %x2",
72, 10, 120, 19, &G.displaymode, 0.0,
(float)R_DISPLAYWIN, 0, 0, "Sets render output display");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
