Details

Reviewers

Commits

rB4e98d974b596: Nodes: Begin splitting composite node buttons into individual files

Summary

Currently, most node buttons are defined in drawnode.cc however,
this is inconvenient because it requires editing many files when adding new nodes.
The goal is to minimize the number of files needed to add or update a node.

This commit moves most of the node layout functions for composite nodes into their respected
source/blender/nodes/composite/nodes file.

In the future, these functions will be simplified to node_layout once files have their own namespace.
See D13466: Cleanup: Composite nodes: add namespace for every file for more information.

Diff Detail

Repository

rB Blender

Branch

nodes-composite-split-ui (branched from master)

Build Status

Buildable 19345
Build 19345: arc lint + arc unit

Event Timeline

Aaron Carlisle (Blendify) requested review of this revision.Dec 9 2021, 3:21 AM

Aaron Carlisle (Blendify) created this revision.

Harbormaster completed remote builds in B19317: Diff 45845.Dec 9 2021, 3:21 AM

Aaron Carlisle (Blendify) retitled this revision from Nodes: Begin splitting composite nodes into individual files to Nodes: Begin splitting composite node buttons into individual files.Dec 9 2021, 3:23 AM

Aaron Carlisle (Blendify) added a reviewer: Hans Goudey (HooglyBoogly).

Is there any reason to just do these three, rather than changing all or most of them?

Only to keep the diff small to make sure there are no issues with this change, otherwise, most/all can be moved.

There are some common UIs such as curves, normals, etc... that share the same drawing function among different node tree types, but IMO it is ok to duplicate the code.

Move more node buttonds
Merge branch 'master' into nodes-composite-split-ui

Harbormaster completed remote builds in B19339: Diff 45885.Dec 9 2021, 10:32 PM

More Nodes

Harbormaster completed remote builds in B19343: Diff 45894.Dec 10 2021, 12:57 AM

Aaron Carlisle (Blendify) retitled this revision from Nodes: Begin splitting composite node buttons into individual files to Nodes: splitting composite node buttons into individual node files.Dec 10 2021, 1:03 AM

Aaron Carlisle (Blendify) edited the summary of this revision. (Show Details)

Clang format

Harbormaster completed remote builds in B19345: Diff 45896.Dec 10 2021, 1:06 AM

this is inconvenient because it is hard to discover

I wouldn't really call it "hard to discover", it's more about making each node more independent, both conceptually and functionally, and decreasing the amount of files related to one node.

Were there any reused functions that are now duplicated in this batch of changes? I do like the idea of one commit for the trivial changes and dealing with the more complex changes separately.

Yes this patch is only the trivial nodes.

When I moved the geometry nodes layout functions, I changed the names slightly, for example:
node_composit_buts_color_matte -> node_composit_color_matte_layout

Since these nodes will probably move to their own namespaces and have their function names simplified anyway, I don't mind if that isn't done now.

The commit message should reflect my comment about the patch description.

This revision is now accepted and ready to land.Dec 15 2021, 8:10 PM

Since these nodes will probably move to their own namespaces and have their function names simplified anyway, I don't mind if that isn't done now.

Yeah, I didn't want to waste the time when all these functions will be remained to node_layout in the future.

Aaron Carlisle (Blendify) edited the summary of this revision. (Show Details)Dec 16 2021, 2:25 AM

Merge branch 'master' into arcpatch-D13523
Add missing include

Harbormaster completed remote builds in B19470: Diff 46101.Dec 16 2021, 3:28 AM

Closed by commit rB4e98d974b596: Nodes: Begin splitting composite node buttons into individual files (authored by Aaron Carlisle (Blendify)). · Explain WhyDec 16 2021, 3:30 AM

This revision was automatically updated to reflect the committed changes.

Aaron Carlisle (Blendify) added a commit: rB4e98d974b596: Nodes: Begin splitting composite node buttons into individual files.

Nodes: Begin splitting composite node buttons into individual filesClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 45896

source/blender/editors/space_node/drawnode.cc

source/blender/nodes/composite/nodes/node_composite_alphaOver.cc

source/blender/nodes/composite/nodes/node_composite_antialiasing.cc

source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc

source/blender/nodes/composite/nodes/node_composite_blur.cc

source/blender/nodes/composite/nodes/node_composite_bokehblur.cc

source/blender/nodes/composite/nodes/node_composite_bokehimage.cc

source/blender/nodes/composite/nodes/node_composite_boxmask.cc

source/blender/nodes/composite/nodes/node_composite_brightness.cc

source/blender/nodes/composite/nodes/node_composite_channelMatte.cc

source/blender/nodes/composite/nodes/node_composite_chromaMatte.cc

source/blender/nodes/composite/nodes/node_composite_colorMatte.cc

source/blender/nodes/composite/nodes/node_composite_colorSpill.cc

source/blender/nodes/composite/nodes/node_composite_colorbalance.cc

source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc

source/blender/nodes/composite/nodes/node_composite_composite.cc

source/blender/nodes/composite/nodes/node_composite_crop.cc

source/blender/nodes/composite/nodes/node_composite_curves.cc

source/blender/nodes/composite/nodes/node_composite_defocus.cc

source/blender/nodes/composite/nodes/node_composite_denoise.cc

source/blender/nodes/composite/nodes/node_composite_despeckle.cc

source/blender/nodes/composite/nodes/node_composite_diffMatte.cc

source/blender/nodes/composite/nodes/node_composite_dilate.cc

source/blender/nodes/composite/nodes/node_composite_directionalblur.cc

source/blender/nodes/composite/nodes/node_composite_distanceMatte.cc

source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.cc

source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc

source/blender/nodes/composite/nodes/node_composite_filter.cc

source/blender/nodes/composite/nodes/node_composite_flip.cc

source/blender/nodes/composite/nodes/node_composite_glare.cc

source/blender/nodes/composite/nodes/node_composite_idMask.cc

source/blender/nodes/composite/nodes/node_composite_image.cc

source/blender/nodes/composite/nodes/node_composite_inpaint.cc

source/blender/nodes/composite/nodes/node_composite_invert.cc

source/blender/nodes/composite/nodes/node_composite_keying.cc

source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc

source/blender/nodes/composite/nodes/node_composite_lensdist.cc

source/blender/nodes/composite/nodes/node_composite_levels.cc

source/blender/nodes/composite/nodes/node_composite_lummaMatte.cc

source/blender/nodes/composite/nodes/node_composite_mapRange.cc

source/blender/nodes/composite/nodes/node_composite_mapUV.cc

source/blender/nodes/composite/nodes/node_composite_mapValue.cc

source/blender/nodes/composite/nodes/node_composite_mask.cc

source/blender/nodes/composite/nodes/node_composite_movieclip.cc

source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc

source/blender/nodes/composite/nodes/node_composite_outputFile.cc

source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc

source/blender/nodes/composite/nodes/node_composite_premulkey.cc

source/blender/nodes/composite/nodes/node_composite_rotate.cc

source/blender/nodes/composite/nodes/node_composite_scale.cc

source/blender/nodes/composite/nodes/node_composite_setalpha.cc

source/blender/nodes/composite/nodes/node_composite_splitViewer.cc

source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc

source/blender/nodes/composite/nodes/node_composite_sunbeams.cc

source/blender/nodes/composite/nodes/node_composite_switch.cc

source/blender/nodes/composite/nodes/node_composite_switchview.cc

source/blender/nodes/composite/nodes/node_composite_tonemap.cc

source/blender/nodes/composite/nodes/node_composite_trackpos.cc

source/blender/nodes/composite/nodes/node_composite_transform.cc

source/blender/nodes/composite/nodes/node_composite_translate.cc

source/blender/nodes/composite/nodes/node_composite_vecBlur.cc

source/blender/nodes/composite/nodes/node_composite_viewer.cc

source/blender/nodes/composite/nodes/node_composite_zcombine.cc

Nodes: Begin splitting composite node buttons into individual files
ClosedPublic
Actions

Revision Contents
Changeset List