[Bf-blender-cvs] [a90cb41cb98] master: Cleanup: clang-format

Brecht Van Lommel noreply at git.blender.org
Tue Oct 26 16:39:01 CEST 2021


Commit: a90cb41cb985183d884c1e688d27da8e746cba99
Author: Brecht Van Lommel
Date:   Tue Oct 26 16:35:26 2021 +0200
Branches: master
https://developer.blender.org/rBa90cb41cb985183d884c1e688d27da8e746cba99

Cleanup: clang-format

===================================================================

M	source/blender/blenkernel/intern/collection.c
M	source/blender/blenkernel/intern/screen.c
M	source/blender/blenlib/intern/serialize.cc
M	source/blender/blenlib/tests/BLI_serialize_test.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 17122200295..2dca5dcb75d 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -161,7 +161,8 @@ static void collection_foreach_id(ID *id, LibraryForeachIDData *data)
     BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, cob->ob, IDWALK_CB_USER);
   }
   LISTBASE_FOREACH (CollectionChild *, child, &collection->children) {
-    BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, child->collection, IDWALK_CB_NEVER_SELF | IDWALK_CB_USER);
+    BKE_LIB_FOREACHID_PROCESS_IDSUPER(
+        data, child->collection, IDWALK_CB_NEVER_SELF | IDWALK_CB_USER);
   }
   LISTBASE_FOREACH (CollectionParent *, parent, &collection->parents) {
     /* XXX This is very weak. The whole idea of keeping pointers to private IDs is very bad
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index df826dff602..3e1a2a9bbe9 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -201,9 +201,9 @@ void BKE_screen_foreach_id_screen_area(LibraryForeachIDData *data, ScrArea *area
           if (path == snode->treepath.first) {
             /* first nodetree in path is same as snode->nodetree */
             BKE_LIB_FOREACHID_PROCESS_IDSUPER(data,
-                                      path->nodetree,
-                                      is_private_nodetree ? IDWALK_CB_EMBEDDED :
-                                                            IDWALK_CB_USER_ONE);
+                                              path->nodetree,
+                                              is_private_nodetree ? IDWALK_CB_EMBEDDED :
+                                                                    IDWALK_CB_USER_ONE);
           }
           else {
             BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, path->nodetree, IDWALK_CB_USER_ONE);
diff --git a/source/blender/blenlib/intern/serialize.cc b/source/blender/blenlib/intern/serialize.cc
index 1e023a9f782..52aff140e3e 100644
--- a/source/blender/blenlib/intern/serialize.cc
+++ b/source/blender/blenlib/intern/serialize.cc
@@ -214,4 +214,3 @@ std::unique_ptr<Value> JsonFormatter::deserialize(std::istream &is)
 }
 
 }  // namespace blender::io::serialize
-
diff --git a/source/blender/blenlib/tests/BLI_serialize_test.cc b/source/blender/blenlib/tests/BLI_serialize_test.cc
index 8e4ce66fa7c..6c55a85ca1e 100644
--- a/source/blender/blenlib/tests/BLI_serialize_test.cc
+++ b/source/blender/blenlib/tests/BLI_serialize_test.cc
@@ -205,4 +205,3 @@ TEST(serialize, json_roundtrip_ordering)
 }
 
 }  // namespace blender::io::serialize::json::testing
-



More information about the Bf-blender-cvs mailing list