blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Hans Goudey 2022-12-02 11:24:18 -06:00
parent 5b8e2ebd97 99dc90accc
commit 6b7119f9ed
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_data_curves.py
View File

@ -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

6
release/scripts/startup/bl_ui/properties_data_mesh.py
View File

@ -537,7 +537,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
@ -633,9 +633,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

2
release/scripts/startup/bl_ui/properties_data_pointcloud.py
View File

@ -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

2
source/blender/makesrna/intern/rna_attribute.c
View File

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