Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Do no limit viewport samples to USHRT_MAX when value is at 0.

Browse Source 
We don't limit manually setting higher values, this was probably overlooked here.

Found by @Blendify in IRC.
This commit is contained in:
Thomas Dinges
2016-03-11 21:33:56 +01:00
parent 1394369332
commit 93895420eb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_sync.cpp
View File

@@ -546,7 +546,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
else {
params.samples = preview_aa_samples;
if(params.samples == 0)
params.samples = USHRT_MAX;
params.samples = INT_MAX;
}
}
else {
@@ -556,7 +556,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
else {
params.samples = preview_samples;
if(params.samples == 0)
params.samples = USHRT_MAX;
params.samples = INT_MAX;
}
}

2
intern/cycles/render/session.cpp
View File

@@ -870,7 +870,7 @@ void Session::update_status_time(bool show_pause, bool show_done)
substatus += string_printf(", Sample %d/%d", status_sample, num_samples);
}
}
else if(tile_manager.num_samples == USHRT_MAX)
else if(tile_manager.num_samples == INT_MAX)
substatus = string_printf("Path Tracing Sample %d", sample+1);
else
substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);