forked from bartvdbraak/blender
Fix T101231: Console flooded with warnings when fluid type is Domain
Although rB67e23b4b2967 turned the problem more recurrent, the warning messages in the console always appear when `BKE_fluid_cache_free_all` is called. This is because of a bug in `BLI_filelist_dir_contents` as this function calls `BLI_strdupcat` instead of `BLI_join_dirfile` NOTE: Other places in Blender avoid this problem by making sure to add a `SEP_STR` to the end of the directory. Differential Revision: https://developer.blender.org/D16043
This commit is contained in:
parent
f3a46e2fd9
commit
715c86d9e5
@ -174,10 +174,10 @@ static void bli_builddir(struct BuildDirCtx *dir_ctx, const char *dirname)
|
|||||||
struct direntry *file = &dir_ctx->files[dir_ctx->files_num];
|
struct direntry *file = &dir_ctx->files[dir_ctx->files_num];
|
||||||
while (dlink) {
|
while (dlink) {
|
||||||
char fullname[PATH_MAX];
|
char fullname[PATH_MAX];
|
||||||
|
BLI_join_dirfile(fullname, sizeof(fullname), dirname, dlink->name);
|
||||||
memset(file, 0, sizeof(struct direntry));
|
memset(file, 0, sizeof(struct direntry));
|
||||||
file->relname = dlink->name;
|
file->relname = dlink->name;
|
||||||
file->path = BLI_strdupcat(dirname, dlink->name);
|
file->path = BLI_strdup(fullname);
|
||||||
BLI_join_dirfile(fullname, sizeof(fullname), dirname, dlink->name);
|
|
||||||
if (BLI_stat(fullname, &file->s) != -1) {
|
if (BLI_stat(fullname, &file->s) != -1) {
|
||||||
file->type = file->s.st_mode;
|
file->type = file->s.st_mode;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user