Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-25 13:54:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-25 13:54:27 +0300
commit53dc251fd3d357e704c80b2429c555b0510e5746 (patch)
treeac33565414d175c4dfe92ae4ad429949ab9021a1
parentd7d20b483a27286a446ec06df35d3df42c42c060 (diff)
Remove developer exception hack
This caused too much trouble, also it's possible users run with 'release' in their CWD causing issues. Developers can symlink "release/" to "bin/2.79".
-rw-r--r--source/blender/blenkernel/intern/appdir.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 8d4776dca0e..16f8d16860f 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -290,33 +290,6 @@ static bool get_path_user(
}
/**
- * Special convenience exception for dev builds to allow overrides to the system path.
- * With this, need for running 'make install' can be avoided, e.g. by symlinking SOURCE_DIR/release
- * to EXECUTABLE_DIR/release, or by running Blender from source directory directly.
- */
-static bool get_path_system_dev_build_exception(
- char *targetpath, size_t targetpath_len, const char *relfolder)
-{
- char cwd[FILE_MAX];
-
- /* Try EXECUTABLE_DIR/release/folder_name. Allows symlinking release folder from source dir. */
- if (test_path(targetpath, targetpath_len, bprogdir, "release", relfolder)) {
- return true;
- }
- /* Try CWD/release/folder_name. Allows executing Blender from any directory
- * (usually source dir), even without a release dir in bprogdir. */
- if (BLI_current_working_dir(cwd, sizeof(cwd))) {
- if (test_path(targetpath, targetpath_len, cwd, "release", relfolder)) {
- return true;
- }
- }
- /* never use if not existing. */
- targetpath[0] = '\0';
-
- return false;
-}
-
-/**
* Returns the path of a folder within the Blender installation directory.
*
* \param targetpath String to return path
@@ -346,10 +319,6 @@ static bool get_path_system(
relfolder[0] = '\0';
}
- if (get_path_system_dev_build_exception(targetpath, targetpath_len, relfolder)) {
- return true;
- }
-
system_path[0] = '\0';
if (test_env_path(system_path, envvar)) {