[Bf-blender-cvs] [709e4431529] master: Cleanup: LayerCollection resync: Proper `r_` prefix for return function parameter.

Bastien Montagne noreply at git.blender.org
Thu Jul 15 14:06:44 CEST 2021


Commit: 709e4431529719ca60b9e58301ce39aaafda88a7
Author: Bastien Montagne
Date:   Thu Jul 15 14:06:09 2021 +0200
Branches: master
https://developer.blender.org/rB709e4431529719ca60b9e58301ce39aaafda88a7

Cleanup: LayerCollection resync: Proper `r_` prefix for return function parameter.

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

M	source/blender/blenkernel/intern/layer.c

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

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) {



More information about the Bf-blender-cvs mailing list