Merge branch 'master' into blender2.8

2018-10-11 09:38:17 +11:00
parent 59e4935266 b618c185cb
commit f5e51ded09
1 changed files with 2 additions and 2 deletions
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1202,12 +1202,12 @@ bool BLI_path_program_search(
 		do {
 			temp = strchr(path, separator);
 			if (temp) {
-				strncpy(filename, path, temp - path);
+				memcpy(filename, path, temp - path);
 				filename[temp - path] = 0;
 				path = temp + 1;
 			}
 			else {
-				strncpy(filename, path, sizeof(filename));
+				BLI_strncpy(filename, path, sizeof(filename));
 			}

 			BLI_path_append(filename, maxlen, name);