[Bf-blender-cvs] [6602f302254] master: Cleanup: early exit when the active layer disallows procedural access

Campbell Barton noreply at git.blender.org
Tue Sep 6 09:16:42 CEST 2022


Commit: 6602f3022545f1bfd86b12390289b9c39df727d7
Author: Campbell Barton
Date:   Tue Sep 6 17:13:41 2022 +1000
Branches: master
https://developer.blender.org/rB6602f3022545f1bfd86b12390289b9c39df727d7

Cleanup: early exit when the active layer disallows procedural access

Once the active layer index is reached, there is no need to keep
searching. Return early instead.

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

M	source/blender/blenkernel/intern/attribute.cc

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

diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc
index 8524f340803..b2c1382c423 100644
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@ -474,8 +474,11 @@ CustomDataLayer *BKE_id_attributes_active_get(ID *id)
       for (int i = 0; i < customdata->totlayer; i++) {
         CustomDataLayer *layer = &customdata->layers[i];
         if (CD_MASK_PROP_ALL & CD_TYPE_AS_MASK(layer->type)) {
-          if (index == active_index && BKE_attribute_allow_procedural_access(layer->name)) {
-            return layer;
+          if (index == active_index) {
+            if (BKE_attribute_allow_procedural_access(layer->name)) {
+              return layer;
+            }
+            return nullptr;
           }
           index++;
         }



More information about the Bf-blender-cvs mailing list