kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Remove SVN references

Browse Source
This commit is contained in:
Campbell Barton 2014-08-06 05:44:51 +10:00
parent ea9d94cf28
commit e56de9d9d5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/buildinfo.cmake
View File

@ -137,7 +137,7 @@ if(WIN32)
execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
endif() endif()
# Write a file with the SVNVERSION define # Write a file with the BUILD_HASH define
file(WRITE buildinfo.h.txt file(WRITE buildinfo.h.txt
"#define BUILD_HASH \"${MY_WC_HASH}\"\n" "#define BUILD_HASH \"${MY_WC_HASH}\"\n"
"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n" "#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"

4
build_files/cmake/cmake_netbeans_project.py
View File

@ -24,7 +24,7 @@
""" """
Example linux usage Example linux usage
python3 ~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake python3 ~/blender-git/blender/build_files/cmake/cmake_netbeans_project.py ~/blender-git/cmake
Windows not supported so far Windows not supported so far
""" """
@ -67,7 +67,7 @@ def create_nb_project_main():
if 0: if 0:
PROJECT_NAME = "Blender" PROJECT_NAME = "Blender"
else: else:
# be tricky, get the project name from SVN if we can! # be tricky, get the project name from git if we can!
PROJECT_NAME = project_name_get() PROJECT_NAME = project_name_get()
# --------------- NB spesific # --------------- NB spesific

4
build_files/cmake/cmake_qtcreator_project.py
View File

@ -27,7 +27,7 @@ Example Win32 usage:
c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
example linux usage example linux usage
python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake python .~/blender-git/blender/build_files/cmake/cmake_qtcreator_project.py ~/blender-git/cmake
""" """
from project_info import (SIMPLE_PROJECTFILE, from project_info import (SIMPLE_PROJECTFILE,
@ -133,7 +133,7 @@ def create_qtc_project_python():
if 0: if 0:
PROJECT_NAME = "Blender_Python" PROJECT_NAME = "Blender_Python"
else: else:
# be tricky, get the project name from SVN if we can! # be tricky, get the project name from git if we can!
PROJECT_NAME = project_name_get() + "_Python" PROJECT_NAME = project_name_get() + "_Python"
FILE_NAME = PROJECT_NAME.lower() FILE_NAME = PROJECT_NAME.lower()

2
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -2232,7 +2232,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
} }
if (sce->r.mode & R_PANORAMA) { if (sce->r.mode & R_PANORAMA) {
/* all these checks to ensure saved files with svn version keep working... */ /* all these checks to ensure saved files between released versions keep working... */
if (sce->r.xsch < sce->r.ysch) { if (sce->r.xsch < sce->r.ysch) {
Object *obc = blo_do_versions_newlibadr(fd, lib, sce->camera); Object *obc = blo_do_versions_newlibadr(fd, lib, sce->camera);
if (obc && obc->type == OB_CAMERA) { if (obc && obc->type == OB_CAMERA) {