From 53dc251fd3d357e704c80b2429c555b0510e5746 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Apr 2018 12:54:27 +0200 Subject: 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". --- source/blender/blenkernel/intern/appdir.c | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'source/blender/blenkernel') 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 @@ -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)) { -- cgit v1.2.3