Commit: 8842a8c4c3b1ed175c4987657e6b26683a7f9eef
Author: Chris Blackbourn
Date: Fri Dec 2 10:14:50 2022 +1300
Branches: master
https://developer.blender.org/rB8842a8c4c3b1ed175c4987657e6b26683a7f9eef
Cleanup: format
===================================================================
M source/blender/blenkernel/intern/scene.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.cc
b/source/blender/blenkernel/intern/scene.cc
index 830122474e1..f86292c1471 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/source/blender/blenkernel/intern/scene.cc
@@ -761,8 +761,7 @@ static void
scene_foreach_layer_collection(LibraryForeachIDData *data, ListBase
(lc->collection->id.flag & LIB_EMBEDDED_DATA) != 0) ?
IDWALK_CB_EMBEDDED :
IDWALK_CB_NOP;
- BKE_LIB_FOREACHID_PROCESS_IDSUPER(
- data, lc->collection, cb_flag | IDWALK_CB_DIRECT_WEAK_LINK);
+ BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, lc->collection, cb_flag |
IDWALK_CB_DIRECT_WEAK_LINK);
scene_foreach_layer_collection(data, &lc->layer_collections);
}
}
@@ -835,11 +834,10 @@ static void scene_foreach_id(ID *id, LibraryForeachIDData
*data)
BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, view_layer->mat_override,
IDWALK_CB_USER);
BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base,
BKE_view_layer_object_bases_get(view_layer)) {
- BKE_LIB_FOREACHID_PROCESS_IDSUPER(data,
- base->object,
- IDWALK_CB_NOP |
-
IDWALK_CB_OVERRIDE_LIBRARY_NOT_OVERRIDABLE |
- IDWALK_CB_DIRECT_WEAK_LINK);
+ BKE_LIB_FOREACHID_PROCESS_IDSUPER(
+ data,
+ base->object,
+ IDWALK_CB_NOP | IDWALK_CB_OVERRIDE_LIBRARY_NOT_OVERRIDABLE |
IDWALK_CB_DIRECT_WEAK_LINK);
}
BKE_LIB_FOREACHID_PROCESS_FUNCTION_CALL(
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
