[Bf-blender-cvs] [99dc90accc2] blender-v3.4-release: Fix: Reversed attribute is_internal RNA property

Hans Goudey noreply at git.blender.org
Fri Dec 2 18:22:05 CET 2022


Commit: 99dc90accc2e279688932f2b94a96d0e546e6437
Author: Hans Goudey
Date:   Fri Dec 2 11:21:54 2022 -0600
Branches: blender-v3.4-release
https://developer.blender.org/rB99dc90accc2e279688932f2b94a96d0e546e6437

Fix: Reversed attribute is_internal RNA property

`is_internal` is supposed to mean that the attribute shouldn't be
visible in lists or the spreadsheet by default, and that it can't be
accessed in geometry nodes. But the value was reversed, which
just happened to work because the list filtering was swapped.

Differential Revision: https://developer.blender.org/D16680

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

M	release/scripts/startup/bl_ui/properties_data_curves.py
M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	release/scripts/startup/bl_ui/properties_data_pointcloud.py
M	source/blender/makesrna/intern/rna_attribute.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_curves.py b/release/scripts/startup/bl_ui/properties_data_curves.py
index df80bdb4552..f71296e98f9 100644
--- a/release/scripts/startup/bl_ui/properties_data_curves.py
+++ b/release/scripts/startup/bl_ui/properties_data_curves.py
@@ -89,7 +89,7 @@ class CURVES_UL_attributes(UIList):
         indices = [i for i in range(len(attributes))]
 
         for item in attributes:
-            flags.append(self.bitflag_filter_item if item.is_internal else 0)
+            flags.append(0 if item.is_internal else self.bitflag_filter_item)
 
         return flags, indices
 
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index b9143fac912..ee10203908f 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -536,7 +536,7 @@ class MESH_UL_attributes(UIList):
         indices = [i for i in range(len(attributes))]
 
         for item in attributes:
-            flags.append(self.bitflag_filter_item if item.is_internal else 0)
+            flags.append(0 if item.is_internal else self.bitflag_filter_item)
 
         return flags, indices
 
@@ -632,9 +632,9 @@ class ColorAttributesListBase():
             skip = (
                 (item.domain not in {"POINT", "CORNER"}) or
                 (item.data_type not in {"FLOAT_COLOR", "BYTE_COLOR"}) or
-                (not item.is_internal)
+                item.is_internal
             )
-            ret.append(self.bitflag_filter_item if not skip else 0)
+            ret.append(0 if skip else self.bitflag_filter_item)
             idxs.append(idx)
 
         return ret, idxs
diff --git a/release/scripts/startup/bl_ui/properties_data_pointcloud.py b/release/scripts/startup/bl_ui/properties_data_pointcloud.py
index d93adcdcc60..6e12a3e8fb2 100644
--- a/release/scripts/startup/bl_ui/properties_data_pointcloud.py
+++ b/release/scripts/startup/bl_ui/properties_data_pointcloud.py
@@ -71,7 +71,7 @@ class POINTCLOUD_UL_attributes(UIList):
         indices = [i for i in range(len(attributes))]
 
         for item in attributes:
-            flags.append(self.bitflag_filter_item if item.is_internal else 0)
+            flags.append(0 if item.is_internal else self.bitflag_filter_item)
 
         return flags, indices
 
diff --git a/source/blender/makesrna/intern/rna_attribute.c b/source/blender/makesrna/intern/rna_attribute.c
index e1b6fb429a7..116eb1059b7 100644
--- a/source/blender/makesrna/intern/rna_attribute.c
+++ b/source/blender/makesrna/intern/rna_attribute.c
@@ -251,7 +251,7 @@ static int rna_Attribute_domain_get(PointerRNA *ptr)
 static bool rna_Attribute_is_internal_get(PointerRNA *ptr)
 {
   const CustomDataLayer *layer = (const CustomDataLayer *)ptr->data;
-  return BKE_attribute_allow_procedural_access(layer->name);
+  return !BKE_attribute_allow_procedural_access(layer->name);
 }
 
 static void rna_Attribute_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)



More information about the Bf-blender-cvs mailing list