diff options
Diffstat (limited to 'source/blender/python/intern/bpy.c')
| -rw-r--r-- | source/blender/python/intern/bpy.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 3377b2c283e..22d54ad72ba 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -94,10 +94,13 @@ static PyObject *bpy_script_paths(PyObject *UNUSED(self)) return ret; } -static bool bpy_blend_paths_visit_cb(void *userdata, char *UNUSED(path_dst), const char *path_src) +static bool bpy_blend_foreach_path_cb(BPathForeachPathData *bpath_data, + char *UNUSED(path_dst), + const char *path_src) { - PyList_APPEND((PyObject *)userdata, PyC_UnicodeFromByte(path_src)); - return false; /* never edits the path */ + PyObject *py_list = bpath_data->user_data; + PyList_APPEND(py_list, PyC_UnicodeFromByte(path_src)); + return false; /* Never edits the path. */ } PyDoc_STRVAR(bpy_blend_paths_doc, @@ -115,7 +118,7 @@ PyDoc_STRVAR(bpy_blend_paths_doc, " :rtype: list of strings\n"); static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObject *kw) { - int flag = 0; + eBPathForeachFlag flag = 0; PyObject *list; bool absolute = false; @@ -137,18 +140,21 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec } if (absolute) { - flag |= BKE_BPATH_TRAVERSE_ABS; + flag |= BKE_BPATH_FOREACH_PATH_ABSOLUTE; } if (!packed) { - flag |= BKE_BPATH_TRAVERSE_SKIP_PACKED; + flag |= BKE_BPATH_FOREACH_PATH_SKIP_PACKED; } if (local) { - flag |= BKE_BPATH_TRAVERSE_SKIP_LIBRARY; + flag |= BKE_BPATH_FOREACH_PATH_SKIP_LINKED; } list = PyList_New(0); - BKE_bpath_traverse_main(G_MAIN, bpy_blend_paths_visit_cb, flag, (void *)list); + BKE_bpath_foreach_path_main(&(BPathForeachPathData){.bmain = G_MAIN, + .callback_function = bpy_blend_foreach_path_cb, + .flag = flag, + .user_data = list}); return list; } |