diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-04-05 19:44:43 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-04-05 19:44:43 +0300 |
| commit | 9e12a731db6f6647d5e6dfdaa32fc4d8117a523d (patch) | |
| tree | a6fb055c75395e351c9b5af16876a3d5524fc325 | |
| parent | 677433b0d0948413afcbe357af1c4e384616bdb8 (diff) | |
temp-sculpt-colors: a few more minor changes
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/attribute.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 8daa2f50d90..929953dd411 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -643,8 +643,6 @@ class DATA_PT_vertex_colors(DATA_PT_mesh_attributes, Panel): col = row.column(align=True) col.operator("geometry.color_attribute_add", icon='ADD', text="") col.operator("geometry.color_attribute_remove", icon='REMOVE', text="") - - active = mesh.attributes.active self.draw_attribute_warnings(context, layout) diff --git a/source/blender/blenkernel/intern/attribute.c b/source/blender/blenkernel/intern/attribute.c index 651ba197f51..13c896fd1ab 100644 --- a/source/blender/blenkernel/intern/attribute.c +++ b/source/blender/blenkernel/intern/attribute.c @@ -92,7 +92,8 @@ static CustomData *attribute_customdata_find(ID *id, CustomDataLayer *layer) for (AttributeDomain domain = 0; domain < ATTR_DOMAIN_NUM; domain++) { CustomData *customdata = info[domain].customdata; - if (customdata && ARRAY_HAS_ITEM(layer, customdata->layers, customdata->totlayer)) { + if (customdata && + ARRAY_HAS_ITEM(layer, (CustomDataLayer const *)customdata->layers, customdata->totlayer)) { return customdata; } } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc index 5e7dfe88b2d..7d159eb3df2 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc @@ -21,9 +21,9 @@ struct VColRef { /** Get all vcol layers as AttributeRefs. * - * \param vcol_layers bitmask to fitler vcol layers by, each bit - * corrusponds to the integer position of the attribute - * within the global color attribute list. + * \param vcol_layers: bitmask to filter vcol layers by, each bit + * corresponds to the integer position of the attribute + * within the global color attribute list. */ static blender::Vector<VColRef> get_vcol_refs(const CustomData *cd_vdata, const CustomData *cd_ldata, |