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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-11-30 01:18:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-11-30 02:15:17 +0300
commitac447ba1a3f2479f65c9ceddebaafc47681623ba (patch)
treeb134c5750696a977700f990477d9e3478750ae0a /source/blender/blenkernel
parente2473d3baf00eb9984ce679c716489d891019279 (diff)
Cleanup: clang-format, trailing space
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/blendfile.c10
-rw-r--r--source/blender/blenkernel/intern/object.cc3
-rw-r--r--source/blender/blenkernel/intern/volume.cc3
3 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 11b54a27185..dbc418c141c 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -90,10 +90,12 @@ static bool foreach_path_clean_cb(BPathForeachPathData *UNUSED(bpath_data),
/* make sure path names are correct for OS */
static void clean_paths(Main *bmain)
{
- BKE_bpath_foreach_path_main(&(BPathForeachPathData){.bmain = bmain,
- .callback_function = foreach_path_clean_cb,
- .flag = BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE,
- .user_data = NULL});
+ BKE_bpath_foreach_path_main(&(BPathForeachPathData){
+ .bmain = bmain,
+ .callback_function = foreach_path_clean_cb,
+ .flag = BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE,
+ .user_data = NULL,
+ });
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
BLI_path_slash_native(scene->r.pic);
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index efb8cdd9c9d..a73a8a75127 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -549,7 +549,8 @@ static void object_foreach_id(ID *id, LibraryForeachIDData *data)
}
}
-static void object_foreach_path_pointcache(ListBase *ptcache_list, BPathForeachPathData *bpath_data)
+static void object_foreach_path_pointcache(ListBase *ptcache_list,
+ BPathForeachPathData *bpath_data)
{
for (PointCache *cache = (PointCache *)ptcache_list->first; cache != nullptr;
cache = cache->next) {
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index c79d4e8cd87..05734aaf77f 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -581,7 +581,8 @@ static void volume_foreach_path(ID *id, BPathForeachPathData *bpath_data)
{
Volume *volume = reinterpret_cast<Volume *>(id);
- if (volume->packedfile != nullptr && (bpath_data->flag & BKE_BPATH_FOREACH_PATH_SKIP_PACKED) != 0) {
+ if (volume->packedfile != nullptr &&
+ (bpath_data->flag & BKE_BPATH_FOREACH_PATH_SKIP_PACKED) != 0) {
return;
}