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

Code cleanup / Cycles:

Browse Source 
* Use USHRT_MAX rather than manual value, suggested by Campbell.
This commit is contained in:
Thomas Dinges
2013-07-19 22:56:54 +00:00
parent a07ac7e644
commit 51a3371d87
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

@@ -428,7 +428,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
else {
params.samples = preview_aa_samples;
if(params.samples == 0)
params.samples = 65536;
params.samples = USHRT_MAX;
}
}
else {
@@ -438,7 +438,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
else {
params.samples = preview_samples;
if(params.samples == 0)
params.samples = 65536;
params.samples = USHRT_MAX;
}
}

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

@@ -786,7 +786,7 @@ void Session::update_status_time(bool show_pause, bool show_done)
substatus += string_printf(", Sample %d/%d", sample, num_samples);
}
}
else if(tile_manager.num_samples == 65536)
else if(tile_manager.num_samples == USHRT_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);