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:
authorThomas Dinges <blender@dingto.org>2016-03-31 14:35:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-13 10:45:30 +0300
commit3156055e272615d6695824e7d120f3a377da0a79 (patch)
treec00a6c3d94675d9d89c00357e7eeefcbc6f45704 /intern/cycles/util/util_view.cpp
parentbd7e4d2a3db3231cde0b25666d3293e20cca8e92 (diff)
Show version number in UI as well
Diffstat (limited to 'intern/cycles/util/util_view.cpp')
-rw-r--r--intern/cycles/util/util_view.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp
index 9db7dda59cc..5aec57b9c44 100644
--- a/intern/cycles/util/util_view.cpp
+++ b/intern/cycles/util/util_view.cpp
@@ -20,6 +20,7 @@
#include "util_opengl.h"
#include "util_time.h"
+#include "util_version.h"
#include "util_view.h"
#ifdef __APPLE__
@@ -97,7 +98,9 @@ void view_display_help()
glColor3f(0.8f, 0.8f, 0.8f);
- view_display_text(x1+20, y2-20, "Cycles Renderer");
+ string info = string("Cycles Renderer ") + CYCLES_VERSION_STRING;
+
+ view_display_text(x1+20, y2-20, info.c_str());
view_display_text(x1+20, y2-40, "(C) 2011-2016 Blender Foundation");
view_display_text(x1+20, y2-80, "Controls:");
view_display_text(x1+20, y2-100, "h: Info/Help");