diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-22 00:51:43 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-22 00:51:43 +0400 |
| commit | b65061e2ae95e92dea8b1009bf0cf4e02254dac2 (patch) | |
| tree | f23d15bfe409197865d1aa8ddf877a562ac75ac3 /intern/cycles/app | |
| parent | 2f90cfd423b49d28443bc69ad2cfe551622e0cdf (diff) | |
Cycles: code refactoring, to do render layer visibility test a bit different,
replacing the camera visibility flag with object layer flags.
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_test.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/app/cycles_test.cpp b/intern/cycles/app/cycles_test.cpp index 83816727404..d162dbf12a9 100644 --- a/intern/cycles/app/cycles_test.cpp +++ b/intern/cycles/app/cycles_test.cpp @@ -82,9 +82,9 @@ static void session_print_status() session_print(status); } -static BufferParams session_buffer_params() +static BufferParams& session_buffer_params() { - BufferParams buffer_params; + static BufferParams buffer_params; buffer_params.width = options.width; buffer_params.height = options.height; buffer_params.full_width = options.width; diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index f5cc01cd062..21b03b56b7a 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -258,7 +258,6 @@ static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node) xml_read_int(&integrator->min_bounce, node, "min_bounce"); xml_read_int(&integrator->max_bounce, node, "max_bounce"); xml_read_bool(&integrator->no_caustics, node, "no_caustics"); - xml_read_float(&integrator->blur_caustics, node, "blur_caustics"); } /* Camera */ |