[Bf-blender-cvs] [be55327] master: Make blender-* branches not being displayed on the splash

Sergey Sharybin noreply at git.blender.org
Mon Jun 16 10:59:38 CEST 2014


Commit: be553273b80332c3191010feec34bc216273acbb
Author: Sergey Sharybin
Date:   Mon Jun 16 14:58:56 2014 +0600
https://developer.blender.org/rBbe553273b80332c3191010feec34bc216273acbb

Make blender-* branches not being displayed on the splash

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

M	build_files/scons/tools/Blender.py

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

diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 621a85a..5074762 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -457,6 +457,9 @@ def buildinfo(lenv, build_type):
                 unpushed_log = os.popen('git log --oneline @{u}..').read().strip()
                 has_local_changes = unpushed_log != ''
 
+            if build_branch.startswith('blender-'):
+                build_branch = 'master'
+
             if has_local_changes:
                 build_branch += ' (modified)'
     else:




More information about the Bf-blender-cvs mailing list