blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

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".
This commit is contained in:
Campbell Barton 2018-04-25 12:54:27 +02:00
parent d7d20b483a
commit 53dc251fd3
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/blenkernel/intern/appdir.c
View File

@ -289,33 +289,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.
*
@ -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)) {