From 89eeae955b1c3904c0c511e93d63f3f1677773fb Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 17 Sep 2012 10:55:18 +0000 Subject: Cycles: change preview "resolution divider" that gave the number of lower resolutions to render, to a "start resolution" which gives the resolution to start at. This avoids unnecessary rendering of small resolutions in small viewports, and avoids long waiting on big viewports. --- intern/cycles/blender/addon/properties.py | 10 +++++----- intern/cycles/blender/addon/ui.py | 2 +- intern/cycles/blender/blender_sync.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'intern/cycles/blender') diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 7f3eca471e6..0fadfa0afc8 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -242,11 +242,11 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): default=1024, ) - cls.resolution_divider = IntProperty( - name="Resolution Divider", - description="For viewport render, the number of lower resolutions to render before the full resolution", - min=1, max=512, - default=4, + cls.preview_start_resolution = IntProperty( + name="Start Resolution", + description="Resolution to start rendering preview at, progressively increasing it to the full viewport size", + min=8, max=16384, + default=64, ) cls.debug_reset_timeout = FloatProperty( diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 7486edf2319..1aef36e0988 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -216,7 +216,7 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel): sub = col.column(align=True) sub.label(text="Viewport:") - sub.prop(cscene, "resolution_divider") + sub.prop(cscene, "preview_start_resolution") class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 907573cf072..b4990eb815a 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -368,7 +368,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use params.tile_size = make_int2(tile_x, tile_y); } - params.resolution = 1 << get_int(cscene, "resolution_divider"); + params.start_resolution = get_int(cscene, "preview_start_resolution"); /* other parameters */ params.threads = b_scene.render().threads(); @@ -379,7 +379,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use if(background) { params.progressive = false; - params.resolution = 1; + params.start_resolution = INT_MAX; } else params.progressive = true; -- cgit v1.2.3