Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-25 12:47:37 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-11-08 20:31:33 +0300
commitc39f34def9791213d1f4439f6830ccc8f72bc1a7 (patch)
tree8cf7b8dede1481c0fba2c7f672d68d1cdd0d5054 /intern/cycles/render
parentc81ddc97ef7e6aed227f8893d387849ee8390404 (diff)
Fix Cycles viewport render info overlapping other text.
Now it shows more compact info below the view/object name. Render time and memory usage is left out, as in most cases this is not so important. These could be added back optionally if needed.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/session.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index d6ecafa19b7..db13564037e 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -921,10 +921,10 @@ void Session::update_status_time(bool show_pause, bool show_done)
num_samples);
if(show_pause) {
- status = "Paused";
+ status = "Rendering Paused";
}
else if(show_done) {
- status = "Done";
+ status = "Rendering Done";
progress.set_end_time(); /* Save end time so that further calls to get_time are accurate. */
}
else {