Details

Reviewers

Maniphest Tasks

T97468: Update Attribute Conversion operator after recent color attribute changes.

Commits

rBb9799dfb8a78: Geometry Nodes: better support for byte color attributes

Summary

Since rBeae36be372a6: Refactor: Unify vertex and sculpt colors into new the distinction between float and byte colors is more explicit in the ui. So far, geometry nodes couldn't really deal with byte colors in general. This patch fixes that. There is still only one color socket, which contains float colors. Conversion to and from byte colors is done when read from or writing to attributes.

Support writing to byte color attributes in Store Named Attribute node.
Support converting to/from byte color in attribute conversion operator.
Support propagating byte color attributes.
Add all the implicit conversions from byte colors to the other types.
Display byte colors as integers in spreadsheet.

Diff Detail

Repository

rB Blender

Branch

update-attribute-conversion (branched from master)

Build Status

Buildable 21716
Build 21716: arc lint + arc unit

Event Timeline

Jacques Lucke (JacquesLucke) requested review of this revision.Apr 20 2022, 3:48 PM

Jacques Lucke (JacquesLucke) created this revision.

Harbormaster completed remote builds in B21716: Diff 50620.Apr 20 2022, 3:48 PM

Jacques Lucke (JacquesLucke) added a task: T97468: Update Attribute Conversion operator after recent color attribute changes..Apr 20 2022, 3:48 PM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Apr 20 2022, 3:51 PM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)

Merge branch 'master' into update-attribute-conversion
fix merge conflicts
add mix utils for byte colors

Harbormaster completed remote builds in B21732: Diff 50647.Apr 21 2022, 10:57 AM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Apr 21 2022, 11:29 AM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Apr 21 2022, 11:35 AM

Jacques Lucke (JacquesLucke) retitled this revision from Geometry Nodes: Better support for byte colors. (WIP) to Geometry Nodes: Better support for byte colors..

Jacques Lucke (JacquesLucke) added a reviewer: Hans Goudey (HooglyBoogly).

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Apr 21 2022, 11:39 AM

Hans Goudey (HooglyBoogly) added inline comments.Apr 21 2022, 3:52 PM

source/blender/blenkernel/BKE_type_conversions.hh
5	I'm not thrilled about adding this fields header in such a general header, since it adds a dependency on the functions module for anything that includes `BKE_type_conversions.hh`. I don't see other great options though.
source/blender/blenkernel/intern/mesh.cc
65	Is this necessary? It seems like this case should be covered by `BLI_CPP_TYPE_MAKE(ColorGeometry4b, blender::ColorGeometry4b, CPPTypeFlags::BasicType)`?
source/blender/makesrna/intern/rna_nodetree.c
2158	What about `rna_GeometryNodeAttributeType_type_with_socket_itemf`? A bit easier to see the difference that way IMO.

Merge branch 'master' into update-attribute-conversion
cleanup

Harbormaster completed remote builds in B21737: Diff 50663.Apr 21 2022, 3:59 PM

Jacques Lucke (JacquesLucke) added inline comments.Apr 21 2022, 3:59 PM

source/blender/blenkernel/BKE_type_conversions.hh
5	Yeah, not sure where to put that either. I could make it a standalone function in a header that includes `BKE_type_conversions.hh` and `FN_fields.hh`, but not sure which one that should be.
source/blender/blenkernel/intern/mesh.cc
65	ah right, I added that in the beginning when I was still using `MLoopCol` instead of `ColorGeometry4b`.

remove unused header

Harbormaster completed remote builds in B21738: Diff 50664.Apr 21 2022, 4:01 PM

Hans Goudey (HooglyBoogly) accepted this revision.Apr 21 2022, 4:03 PM

Hans Goudey (HooglyBoogly) added inline comments.

source/blender/blenkernel/BKE_type_conversions.hh
5	Maybe some file like `BKE_type_conversions_field.hh`? It could still be implemented in `type_conversions.cc` A bit weird to have a header just for a single thing, but I don't really mind that, and `FN_field.hh` is sort of a large header.

This revision is now accepted and ready to land.Apr 21 2022, 4:03 PM

Jacques Lucke (JacquesLucke) added inline comments.Apr 21 2022, 4:08 PM

source/blender/blenkernel/BKE_type_conversions.hh
5	Hardly makes any difference now really. `BKE_type_conversions.hh` is only included in 6 translation units, and 5 of those include fields anyway. Only `realize_instances.cc` doesn't include fields yet from what I can tell.

Jacques Lucke (JacquesLucke) added inline comments.Apr 21 2022, 4:09 PM

source/blender/blenkernel/BKE_type_conversions.hh
5	If we want to separate this into a header with a single function, we should follow some rule that is applied in other places in Blender as well.

Closed by commit rBb9799dfb8a78: Geometry Nodes: better support for byte color attributes (authored by Jacques Lucke (JacquesLucke)). · Explain WhyApr 21 2022, 4:12 PM

This revision was automatically updated to reflect the committed changes.

Jacques Lucke (JacquesLucke) added a commit: rBb9799dfb8a78: Geometry Nodes: better support for byte color attributes.

Paul Larson (GeorgiaPacific) added a subscriber: Paul Larson (GeorgiaPacific).Apr 25 2022, 6:15 PM

Zhen Dai (zhendai) mentioned this in T99205: Geometry nodes: vertex color read by named attribute node is in sRGB.Jun 27 2022, 5:36 PM

Hans Goudey (HooglyBoogly) mentioned this in T85962: Many Nodes (Join geometry, Boolean, Object Info?) and realizing instances remove UVs (output float2, not MLoopUV)..Jul 8 2022, 12:03 AM

Geometry Nodes: Better support for byte colors.
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 50620

source/blender/blenkernel/BKE_type_conversions.hh

source/blender/blenkernel/intern/attribute_access.cc

source/blender/blenkernel/intern/attribute_access_intern.hh

source/blender/blenkernel/intern/customdata.cc

source/blender/blenkernel/intern/geometry_component_mesh.cc

source/blender/blenkernel/intern/mesh.cc

source/blender/blenkernel/intern/type_conversions.cc

source/blender/editors/geometry/geometry_attributes.cc

source/blender/editors/space_spreadsheet/space_spreadsheet.cc

source/blender/editors/space_spreadsheet/spreadsheet_column.cc

source/blender/editors/space_spreadsheet/spreadsheet_layout.cc

source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc

source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc

source/blender/functions/FN_field.hh

source/blender/functions/intern/field.cc

source/blender/makesdna/DNA_space_types.h

source/blender/makesrna/intern/rna_nodetree.c

source/blender/makesrna/intern/rna_space.c

source/blender/modifiers/intern/MOD_nodes_evaluator.cc

source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc

Geometry Nodes: Better support for byte colors.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 50620

source/blender/blenkernel/BKE_type_conversions.hh

source/blender/blenkernel/intern/attribute_access.cc

source/blender/blenkernel/intern/attribute_access_intern.hh

source/blender/blenkernel/intern/customdata.cc

source/blender/blenkernel/intern/geometry_component_mesh.cc

source/blender/blenkernel/intern/mesh.cc

source/blender/blenkernel/intern/type_conversions.cc

source/blender/editors/geometry/geometry_attributes.cc

source/blender/editors/space_spreadsheet/space_spreadsheet.cc

source/blender/editors/space_spreadsheet/spreadsheet_column.cc

source/blender/editors/space_spreadsheet/spreadsheet_layout.cc

source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc

source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc

source/blender/functions/FN_field.hh

source/blender/functions/intern/field.cc

source/blender/makesdna/DNA_space_types.h

source/blender/makesrna/intern/rna_nodetree.c

source/blender/makesrna/intern/rna_space.c

source/blender/modifiers/intern/MOD_nodes_evaluator.cc

source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc

Geometry Nodes: Better support for byte colors.
ClosedPublic
Actions

Revision Contents
Changeset List