[Bf-blender-cvs] [1da5e8d] master: error in last commit

Campbell Barton noreply at git.blender.org
Wed Feb 25 08:19:59 CET 2015


Commit: 1da5e8df6f101021a89f119614f0160b874a8932
Author: Campbell Barton
Date:   Wed Feb 25 18:19:39 2015 +1100
Branches: master
https://developer.blender.org/rB1da5e8df6f101021a89f119614f0160b874a8932

error in last commit

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 220199b..94a8aa2 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1071,8 +1071,8 @@ function(get_blender_version)
 
 	# output vars
 	set(BLENDER_VERSION "${_out_version_major}.${_out_version_minor}" PARENT_SCOPE)
-	set(BLENDER_VERSION_MAJOR "${_out_subversion}" PARENT_SCOPE)
-	set(BLENDER_VERSION_MINOR "${_out_subversion}" PARENT_SCOPE)
+	set(BLENDER_VERSION_MAJOR "${_out_version_major}" PARENT_SCOPE)
+	set(BLENDER_VERSION_MINOR "${_out_version_minor}" PARENT_SCOPE)
 	set(BLENDER_SUBVERSION "${_out_subversion}" PARENT_SCOPE)
 	set(BLENDER_VERSION_CHAR "${_out_version_char}" PARENT_SCOPE)
 	set(BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index}" PARENT_SCOPE)




More information about the Bf-blender-cvs mailing list