From f9e0b94c2fadea99ba8d14094c9ed5c1a92e03ef Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 11 May 2022 09:50:54 +1000 Subject: Cleanup: format --- source/blender/io/common/CMakeLists.txt | 1 - source/blender/io/common/IO_path_util.hh | 6 +++--- source/blender/io/common/intern/path_util.cc | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/io/common') diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt index 95ffbe19ada..e80bd850825 100644 --- a/source/blender/io/common/CMakeLists.txt +++ b/source/blender/io/common/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../../depsgraph ../../makesdna ../../../../intern/guardedalloc - ) set(INC_SYS diff --git a/source/blender/io/common/IO_path_util.hh b/source/blender/io/common/IO_path_util.hh index ac2f935523e..eeb5a9dbcfe 100644 --- a/source/blender/io/common/IO_path_util.hh +++ b/source/blender/io/common/IO_path_util.hh @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "BLI_string_ref.hh" #include "BLI_set.hh" +#include "BLI_string_ref.hh" #include "IO_path_util_types.h" @@ -14,7 +14,7 @@ namespace blender::io { * * When PATH_REFERENCE_COPY mode is used, the file path pair (source * path, destination path) is added to the `copy_set`. - * + * * Equivalent of bpy_extras.io_utils.path_reference. */ std::string path_reference(StringRefNull filepath, @@ -26,4 +26,4 @@ std::string path_reference(StringRefNull filepath, /** Execute copying files of path_reference. */ void path_reference_copy(const Set> ©_set); -} // namespace blender::io +} // namespace blender::io diff --git a/source/blender/io/common/intern/path_util.cc b/source/blender/io/common/intern/path_util.cc index 2b9a1d67b44..902cf552bf0 100644 --- a/source/blender/io/common/intern/path_util.cc +++ b/source/blender/io/common/intern/path_util.cc @@ -28,7 +28,8 @@ std::string path_reference(StringRefNull filepath, } else if (mode == PATH_REFERENCE_COPY) { char filepath_cpy[PATH_MAX]; - BLI_path_join(filepath_cpy, PATH_MAX, base_dst.c_str(), BLI_path_basename(filepath_abs), nullptr); + BLI_path_join( + filepath_cpy, PATH_MAX, base_dst.c_str(), BLI_path_basename(filepath_abs), nullptr); copy_set->add(std::make_pair(filepath_abs, filepath_cpy)); BLI_strncpy(filepath_abs, filepath_cpy, PATH_MAX); mode = PATH_REFERENCE_RELATIVE; -- cgit v1.2.3