Commit: 45b0e93b2e35555a22f8ac25d7af64f76c19c7b4
Author: Thomas Dinges
Date: Fri Mar 11 21:33:56 2016 +0100
Branches: blender-v2.77-release
https://developer.blender.org/rB45b0e93b2e35555a22f8ac25d7af64f76c19c7b4
Cycles: Do no limit viewport samples to USHRT_MAX when value is at 0.
We don't limit manually setting higher values, this was probably overlooked
here.
Found by @Blendify in IRC.
===================================================================
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_sync.cpp
b/intern/cycles/blender/blender_sync.cpp
index a3cccc6..3098522 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -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;
}
}
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 762e49a..84a420c 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
