From b2cd81ca0f2bf00276fd1564e3784b6833ddcb0e Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Fri, 3 Nov 2006 10:09:35 +0000 Subject: [PATCH] * shortened formatstring to cope with removal of R_IRIZ (would crash on Windows machines, but Linux didn't complain at all, tsk tsk) - this may fix odd crashes for those that try to open up .blends with scene buttons visible * added a define around yafray panel --- source/blender/src/buttons_scene.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 13ddaf033ed..76df7af7b74 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1024,7 +1024,7 @@ static char *imagetype_pup(void) char formatstring[1024]; char appendstring[1024]; - strcpy(formatstring, "Save image as: %%t|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d"); + strcpy(formatstring, "Save image as: %%t|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d|%s %%x%d"); #ifdef __sgi strcat(formatstring, "|%s %%x%d"); // add space for Movie @@ -1865,6 +1865,7 @@ void render_panels() } #endif +#ifndef DISABLE_YAFRAY /* yafray: GI & Global panel, only available when yafray enabled for rendering */ if (G.scene->r.renderer==R_YAFRAY) { if (G.scene->r.YF_gamma==0.0) G.scene->r.YF_gamma=1.0; @@ -1877,6 +1878,7 @@ void render_panels() render_panel_yafrayGlobal(); render_panel_yafrayGI(); } +#endif }