diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-04-13 16:49:22 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-04-13 16:49:22 +0400 |
| commit | 84071fbf0a926d2b429eb437d30032fe9a482f45 (patch) | |
| tree | efa7a85e9c705c736b02e81f5e5c6414773b1f63 /source/blender/makesrna/intern/rna_scene.c | |
| parent | d867cefa32ca3b26bbfc279e2f04d4f795dc13a4 (diff) | |
Cycles / Save Buffers:
* Save Buffers could not be disabled in the UI, when "Full Sample" was enabled in Blender Internal.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 7f1fd80a7d9..b8a42ac6c27 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -686,10 +686,14 @@ static int rna_RenderSettings_is_movie_fomat_get(PointerRNA *ptr) static int rna_RenderSettings_save_buffers_get(PointerRNA *ptr) { RenderData *rd = (RenderData *)ptr->data; + Scene *scene = (Scene *)ptr->id.data; + if (rd->mode & R_BORDER) return 0; - else + else if (!BKE_scene_use_new_shading_nodes(scene)) 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) |