diff options
author | Thomas Dinges <blender@dingto.org> | 2014-01-25 21:57:02 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-01-25 21:57:02 +0400 |
commit | f746d90398760b604c0b0037ab5d592dfd88c1ee (patch) | |
tree | 53b0d4a66f9b48fc29ae4bd84678f6783f693895 /intern/cycles/app/cycles_standalone.cpp | |
parent | 70e844ea11f3ed0c215bd667f668303ad55fd785 (diff) |
Cycles Standalone: Various changes
* Change Info in header, put more important info to the left
* API: Move Camera width/height to camera, add some film properties
* Add ESC key to help menu
Diffstat (limited to 'intern/cycles/app/cycles_standalone.cpp')
-rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 144d02ea661..92509949c93 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -163,8 +163,8 @@ static void display_info(Progress& progress) if(substatus != "") status += ": " + substatus; - str = string_printf("latency: %.4f sample: %d total: %.4f average: %.4f %s", - latency, sample, total_time, sample_time, status.c_str()); + str = string_printf("%s Time: %.2f Latency: %.4f Sample: %d Average: %.4f", + status.c_str(), total_time, latency, sample, sample_time); view_display_info(str.c_str()); @@ -313,11 +313,11 @@ static void options_parse(int argc, const char **argv) fprintf(stderr, "Unknown shading system: %s\n", ssname.c_str()); exit(EXIT_FAILURE); } -#endif else if(options.scene_params.shadingsystem == SceneParams::OSL && options.session_params.device.type != DEVICE_CPU) { fprintf(stderr, "OSL shading system only works with CPU device\n"); exit(EXIT_FAILURE); } +#endif else if(options.session_params.samples < 0) { fprintf(stderr, "Invalid number of samples: %d\n", options.session_params.samples); exit(EXIT_FAILURE); |