Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-12-08 17:00:31 +0300
committerJulian Eisel <julian@blender.org>2020-12-08 17:00:31 +0300
commit2678953f699c27122d059eb8ab14e84a5be75c28 (patch)
treeba0c913a9a2d0a2ae5400eae6cb2c08d23da02b8 /source
parent95b3c4c966f9baeb6f73b84568b7f03287e1a350 (diff)
Cleanup: Correct an own earlier commit to use an existing utility function
Didn't know this function existed, better to use it then to avoid verbosity.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenloader/intern/blend_validate.c2
-rw-r--r--source/blender/editors/space_file/filelist.c2
-rw-r--r--source/blender/imbuf/intern/thumbs_blend.c4
-rw-r--r--source/blender/python/intern/bpy_library_load.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c
index 9b42e2d5f40..c281e2fa643 100644
--- a/source/blender/blenloader/intern/blend_validate.c
+++ b/source/blender/blenloader/intern/blend_validate.c
@@ -148,7 +148,7 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports)
}
}
- BLI_linklist_free(names, MEM_freeN);
+ BLI_linklist_freeN(names);
}
BLO_blendhandle_close(bh);
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 58887ae745b..1271feda1e7 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -2621,7 +2621,7 @@ static int filelist_readjob_list_lib(const char *root, ListBase *entries, const
nbr_entries++;
}
- BLI_linklist_free(names, MEM_freeN);
+ BLI_linklist_freeN(names);
return nbr_entries;
}
diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c
index a338ea599f8..d5ded02be62 100644
--- a/source/blender/imbuf/intern/thumbs_blend.c
+++ b/source/blender/imbuf/intern/thumbs_blend.c
@@ -68,7 +68,7 @@ ImBuf *IMB_thumb_load_blend(const char *blen_path, const char *blen_group, const
printf("%s: error, found %d items, %d previews\n", __func__, nnames, nprevs);
}
BLI_linklist_free(previews, BKE_previewimg_freefunc);
- BLI_linklist_free(names, MEM_freeN);
+ BLI_linklist_freeN(names);
return ima;
}
@@ -93,7 +93,7 @@ ImBuf *IMB_thumb_load_blend(const char *blen_path, const char *blen_group, const
}
BLI_linklist_free(previews, BKE_previewimg_freefunc);
- BLI_linklist_free(names, MEM_freeN);
+ BLI_linklist_freeN(names);
}
else {
BlendThumbnail *data;
diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c
index 64590827933..c6f0fbd3a2b 100644
--- a/source/blender/python/intern/bpy_library_load.c
+++ b/source/blender/python/intern/bpy_library_load.c
@@ -227,7 +227,7 @@ static PyObject *_bpy_names(BPy_Library *self, int blocktype)
PyList_SET_ITEM(list, counter, PyUnicode_FromString((char *)l->link));
counter++;
}
- BLI_linklist_free(names, MEM_freeN); /* free linklist *and* each node's data */
+ BLI_linklist_freeN(names); /* free linklist *and* each node's data */
}
return list;