From d7d20b483a27286a446ec06df35d3df42c42c060 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Apr 2018 12:48:51 +0200 Subject: Revert "Fix (unreported) broken 'get system path' in some cases." This reverts commit f1bc0aeddedacf68182164dde5d4674d11aba6c9. --- source/blender/blenkernel/intern/appdir.c | 35 ++++++------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 142449b8aeb..8d4776dca0e 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -298,36 +298,22 @@ static bool get_path_system_dev_build_exception( char *targetpath, size_t targetpath_len, const char *relfolder) { char cwd[FILE_MAX]; - char tmp_path[FILE_MAX]; - bool ret = false; /* Try EXECUTABLE_DIR/release/folder_name. Allows symlinking release folder from source dir. */ if (test_path(targetpath, targetpath_len, bprogdir, "release", relfolder)) { - ret = true; + 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)) { - ret = true; - } - } - - /* Ensure we are in source dir, not in another one that happens to have a release folder. */ - if (ret) { - BLI_join_dirfile(tmp_path, sizeof(tmp_path), bprogdir, - "source" SEP_STR "blender" SEP_STR "blenkernel" SEP_STR "BKE_blender_version.h"); - if (!BLI_is_file(tmp_path)) { - ret = false; + return true; } } - /* never use if not existing. */ - if (!ret) { - targetpath[0] = '\0'; - } + targetpath[0] = '\0'; - return ret; + return false; } /** @@ -376,19 +362,10 @@ static bool get_path_system( } } - const char *blender_version_str = blender_version_decimal(ver); - system_base_path = (const char *)GHOST_getSystemDir(ver, blender_version_str); + system_base_path = (const char *)GHOST_getSystemDir(ver, blender_version_decimal(ver)); if (system_base_path) BLI_strncpy(system_path, system_base_path, FILE_MAX); - - /* GHOST_getSystemDir returns nothing in case of portable install, so we try binary directory itself. */ - if (!system_path[0]) { - const char *prog_dir = BKE_appdir_program_dir(); - if (prog_dir != NULL) { - BLI_join_dirfile(system_path, sizeof(system_path), prog_dir, blender_version_str); - } - } - + if (!system_path[0]) return false; -- cgit v1.2.3 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 From 13b6867d1fd21721bfd1a46501815faa6f6fa375 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Apr 2018 14:53:44 +0200 Subject: CDDM: correct (disabled) logic in merge verts --- source/blender/blenkernel/intern/cdderivedmesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index d65427a861b..1a34b71643f 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -3003,7 +3003,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int MLoop *ml, *mloop = MEM_malloc_arrayN(totloop, sizeof(*mloop), __func__); int *oldl = MEM_malloc_arrayN(totloop, sizeof(*oldl), __func__); #ifdef USE_LOOPS - int newl = MEM_malloc_arrayN(totloop, sizeof(*newl), __func__); + int *newl = MEM_malloc_arrayN(totloop, sizeof(*newl), __func__); #endif STACK_DECLARE(mloop); STACK_DECLARE(oldl); -- cgit v1.2.3