[Bf-blender-cvs] [3156055] master: Show version number in UI as well

[Thomas Dinges]

Commit: 3156055e272615d6695824e7d120f3a377da0a79
Author: Thomas Dinges
Date:   Thu Mar 31 13:35:31 2016 +0200
Branches: master
https://developer.blender.org/rB3156055e272615d6695824e7d120f3a377da0a79

Show version number in UI as well

===================================================================

M	intern/cycles/util/util_view.cpp

===================================================================

diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp
index 9db7dda..5aec57b 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");