diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-16 13:16:18 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-16 13:16:18 +0400 |
| commit | 38d684168759382dac015ead3e768dc015bb817c (patch) | |
| tree | 8355fcbc61c657f6679cfed4bf19f46b598567c8 /build_files | |
| parent | 0125ae1eb24f3cf9e9ad57c3be65f939ed88b338 (diff) | |
Need to consider blender-v* a release branch, not just blender-
This is because of blender-tiles branch we've got..
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/buildinfo.cmake | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 31b1cffc3f6..3660b3e5f2e 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -85,7 +85,7 @@ if(EXISTS ${SOURCE_DIR}/.git) endif() endif() - if(MY_WC_BRANCH MATCHES "^blender-") + if(MY_WC_BRANCH MATCHES "^blender-v") set(MY_WC_BRANCH "master") endif() diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 5074762f851..ee35586814d 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -457,7 +457,7 @@ 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-'): + if build_branch.startswith('blender-v'): build_branch = 'master' if has_local_changes: |