[Bf-blender-cvs] [7d77dcd190] blender-v2.78c-release: Blender 2.78c: Officially move to 'c'

Sergey Sharybin noreply at git.blender.org
Thu Feb 23 16:08:59 CET 2017


Commit: 7d77dcd1904e260d7d393cd87bbf70f62945f3cb
Author: Sergey Sharybin
Date:   Thu Feb 23 15:11:44 2017 +0100
Branches: blender-v2.78c-release
https://developer.blender.org/rB7d77dcd1904e260d7d393cd87bbf70f62945f3cb

Blender 2.78c: Officially move to 'c'

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

M	build_files/cmake/macros.cmake
M	source/blender/blenkernel/BKE_blender_version.h

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 1aa440bff3..ead4fd4f4d 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1198,7 +1198,7 @@ function(get_blender_version)
 	string(LENGTH "${_out_version_char}" _out_version_char_len)
 	if(NOT _out_version_char_len EQUAL 1)
 		set(_out_version_char "")
-	elseif(NOT ${_out_version_char} MATCHES "[a-z]+")
+	elseif(NOT ${_out_version_char} MATCHES "[a-z]?")
 		message(FATAL_ERROR "Version parsing failed for BLENDER_VERSION_CHAR")
 	endif()
 
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 6dad0d79ab..63ac07a7d0 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,7 +35,7 @@
 
 /* used by packaging tools */
 /* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR    b
+#define BLENDER_VERSION_CHAR    c
 /* alpha/beta/rc/release, docs use this */
 #define BLENDER_VERSION_CYCLE   release




More information about the Bf-blender-cvs mailing list