[Bf-blender-cvs] [909da553e34] master: Fix bpy.utils.resource_path('SYSTEM') output

Campbell Barton noreply at git.blender.org
Thu Sep 14 21:48:02 CEST 2017


Commit: 909da553e347679bf69c7fb0b3ed7570451cf050
Author: Campbell Barton
Date:   Fri Sep 15 05:46:30 2017 +1000
Branches: master
https://developer.blender.org/rB909da553e347679bf69c7fb0b3ed7570451cf050

Fix bpy.utils.resource_path('SYSTEM') output

Would return the test path for developer builds:
{blender-dirname/release}

Now return an empty string when no path is found.

===================================================================

M	source/blender/blenkernel/intern/appdir.c

===================================================================

diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index f39d8006f76..d059310a0f8 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -329,10 +329,12 @@ static bool get_path_system(
 			return true;
 		}
 	}
-
 	/* try EXECUTABLE_DIR/release/folder_name */
-	if (test_path(targetpath, targetpath_len, bprogdir, "release", relfolder))
+	if (test_path(targetpath, targetpath_len, bprogdir, "release", relfolder)) {
 		return true;
+	}
+	/* never use if not existing. */
+	targetpath[0] = '\0';
 
 	/* end developer overrides */



More information about the Bf-blender-cvs mailing list