kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles / Save Buffers:

Browse Source 
* Save Buffers could not be disabled in the UI, when "Full Sample" was enabled in Blender Internal.
This commit is contained in:
Thomas Dinges 2013-04-13 12:49:22 +00:00
parent d867cefa32
commit 84071fbf0a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_scene.c
View File

@ -686,10 +686,14 @@ static int rna_RenderSettings_is_movie_fomat_get(PointerRNA *ptr)
static int rna_RenderSettings_save_buffers_get(PointerRNA *ptr) static int rna_RenderSettings_save_buffers_get(PointerRNA *ptr)
{ {
RenderData *rd = (RenderData *)ptr->data; RenderData *rd = (RenderData *)ptr->data;
Scene *scene = (Scene *)ptr->id.data;
if (rd->mode & R_BORDER) if (rd->mode & R_BORDER)
return 0; return 0;
else else if (!BKE_scene_use_new_shading_nodes(scene))
return (rd->scemode & (R_EXR_TILE_FILE | R_FULL_SAMPLE)) != 0; return (rd->scemode & (R_EXR_TILE_FILE | R_FULL_SAMPLE)) != 0;
else
return (rd->scemode & R_EXR_TILE_FILE);
} }
static int rna_RenderSettings_full_sample_get(PointerRNA *ptr) static int rna_RenderSettings_full_sample_get(PointerRNA *ptr)