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:
authorBastien Montagne <bastien@blender.org>2021-07-15 15:06:09 +0300
committerBastien Montagne <bastien@blender.org>2021-07-15 15:06:09 +0300
commit709e4431529719ca60b9e58301ce39aaafda88a7 (patch)
treea4dcb432840df6ddd82882f47621c3826271a850 /source/blender/blenkernel/intern/layer.c
parentddc7e5f1b6b3ee98c2753b224d0c97b4b09802b6 (diff)
Cleanup: LayerCollection resync: Proper `r_` prefix for return function parameter.
Diffstat (limited to 'source/blender/blenkernel/intern/layer.c')
-rw-r--r--source/blender/blenkernel/intern/layer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 8d7e286dc01..730c989abc9 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -739,7 +739,7 @@ int BKE_layer_collection_findindex(ViewLayer *view_layer, const LayerCollection
static void layer_collection_objects_sync(ViewLayer *view_layer,
LayerCollection *layer,
- ListBase *lb_new_object_bases,
+ ListBase *r_lb_new_object_bases,
const short collection_restrict,
const short layer_restrict,
const ushort local_collections_bits)
@@ -765,9 +765,9 @@ static void layer_collection_objects_sync(ViewLayer *view_layer,
* been moved to the new base list and the first/last test ensure that
* case also works. */
base = *base_p;
- if (!ELEM(base, lb_new_object_bases->first, lb_new_object_bases->last)) {
+ if (!ELEM(base, r_lb_new_object_bases->first, r_lb_new_object_bases->last)) {
BLI_remlink(&view_layer->object_bases, base);
- BLI_addtail(lb_new_object_bases, base);
+ BLI_addtail(r_lb_new_object_bases, base);
}
}
else {
@@ -775,7 +775,7 @@ static void layer_collection_objects_sync(ViewLayer *view_layer,
base = object_base_new(cob->ob);
base->local_collections_bits = local_collections_bits;
*base_p = base;
- BLI_addtail(lb_new_object_bases, base);
+ BLI_addtail(r_lb_new_object_bases, base);
}
if ((collection_restrict & COLLECTION_RESTRICT_VIEWPORT) == 0) {