diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-07-02 15:22:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-07-05 22:59:02 +0300 |
commit | 7fcab3324b84183b2bf4672990aa496cd48a7cdd (patch) | |
tree | 96f720033058ae980cbc9ad8175d3ca4190011f7 /source/blender/makesrna/intern/rna_scene.c | |
parent | 037aa544cca18cfef4fa03feac9d88e32332173b (diff) |
Render border: make it work together with with cache result / save buffers / full sample.
Differential Revision: https://developer.blender.org/D2080
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 2943d74f9be..d1f8c4e5bed 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -841,21 +841,12 @@ 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 if (!BKE_scene_use_new_shading_nodes(scene)) + 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) != 0; } -static int rna_RenderSettings_full_sample_get(PointerRNA *ptr) -{ - RenderData *rd = (RenderData *)ptr->data; - - return (rd->scemode & R_FULL_SAMPLE) && !(rd->mode & R_BORDER); -} - static void rna_ImageFormatSettings_file_format_set(PointerRNA *ptr, int value) { ImageFormatData *imf = (ImageFormatData *)ptr->data; @@ -5768,7 +5759,6 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop = RNA_def_property(srna, "use_full_sample", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FULL_SAMPLE); - RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_full_sample_get", NULL); RNA_def_property_ui_text(prop, "Full Sample", "Save for every anti-aliasing sample the entire RenderLayer results " "(this solves anti-aliasing issues with compositing)"); |