Cleanup: Make Accumulate Attribute node more generic #104440

Iliya Katushenock · 2023-02-07T22:21:02+01:00

Iliya Katushenock commented

2023-02-07 22:21:02 +01:00

Geometry Nodes strives to reduce template usage in code,
to use it only for extremely important loops or for template math
processing on attributes. Due to this, this pull request cleans up
to delete template classes and uses convert_to_static_type in
accumulate function directly.

Geometry Nodes strives to reduce template usage in code, to use it only for extremely important loops or for template math processing on attributes. Due to this, this pull request cleans up to delete template classes and uses `convert_to_static_type` in accumulate function directly.

Iliya Katushenock added 1 commit 2023-02-07 22:21:04 +01:00

buildbot/vexp-code-patch-coordinator Build done. Details

ae068ad23c re init

Iliya Katushenock requested review from Hans Goudey 2023-02-07 22:21:14 +01:00

Iliya Katushenock requested review from Jacques Lucke 2023-02-07 22:21:22 +01:00

Iliya Katushenock changed title from ~~Cleanup: Geometry Node: Make Accumulate Attribute node more generic~~ to WIP: Cleanup: Geometry Node: Make Accumulate Attribute node more generic

2023-02-07 22:22:08 +01:00

Iliya Katushenock changed title from ~~WIP: Cleanup: Geometry Node: Make Accumulate Attribute node more generic~~ to Cleanup: Geometry Node: Make Accumulate Attribute node more generic

2023-02-07 22:26:10 +01:00

Iliya Katushenock commented

2023-02-07 23:14:49 +01:00

@blender-bot build

test

@blender-bot build test

Blender Bot commented

2023-02-07 23:14:51 +01:00

Only blender organization members with write access can start builds. See documentation for details.

Only blender organization members with write access can start builds. See [documentation](https://projects.blender.org/infrastructure/blender-bot) for details.

Hans Goudey commented

2023-02-08 04:02:08 +01:00

@blender-bot build

Hans Goudey requested changes 2023-02-08 14:30:57 +01:00

Hans Goudey left a comment

Thanks for re-uploading this. Looks good, but noticed two small things.

release/datafiles/locale Outdated

						
				@ -1 +1 @@

				Subproject commit 4331c8e76c2f42b9fd903716c333d6cdeaa5cebd

				Subproject commit 547a54b294f32ee11bce73273c6f183d8b235f92

Hans Goudey commented

2023-02-08 14:29:08 +01:00

Somehow the submodules are changing here, not sure why

mod_moder marked this conversation as resolved

source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc Outdated

						
				@ -228,3 +232,3 @@

				    evaluator.add(group_index_);

				    evaluator.evaluate();

				    const VArray<T> values = evaluator.get_evaluated<T>(0);

				    const GVArraySpan g_values = evaluator.get_evaluated(0);

Hans Goudey commented

2023-02-08 14:30:13 +01:00

I think I'd leave changing GVArray to GVArraySpan to a separate commit, the performance implications of that aren't obvious.

I think I'd leave changing `GVArray` to `GVArraySpan` to a separate commit, the performance implications of that aren't obvious.

mod_moder marked this conversation as resolved

Iliya Katushenock added 1 commit 2023-02-08 15:01:12 +01:00

dc46826007 changes based on comments

Iliya Katushenock added 13 commits 2023-02-08 16:09:57 +01:00

a5500c2e47 changes based on comments

9621f361cb undo changes in wrong branch

8c614debee Release: support generating LTS release notes from Gitea

Now a single script to generate both links and release notes. It also includes
the issue ID for the LTS releases, so only the release version needs to be
specified.

Pull Request #104402

497cf6ca74 Cleanup: Move 18 sculpt files to C++

To allow further mesh data structure refactoring. See #103343

Pull Request #104436

d1ffb49cb9 Fix #104297 : Cycling geometry nodes viewer ignores sockets

Sockets after the geometry socket were ignored when cycling through
the node's output sockets. If there are multiple geometry sockets, the
behavior could still be refined probably, but this should at least make
basic non-geometry socket cycling work.

753aa473a2 Cleanup: format

a577663ed9 Fix #103913 : Triangulate sometimes creates degenerate triangles

The ear clipping method used by polyfill_2d only excluded concave ears
which meant ears exactly co-linear edges created zero area triangles
even when convex ears are available.

While polyfill_2d prioritizes performance over *pretty* results,
there is no need to pick degenerate triangles with other candidates
are available. As noted in code-comments, callers that require higher
quality tessellation should use BLI_polyfill_beautify.

3df680e362 Cleanup: use enum literals, order likely case first in polyfill_2d

b6d83c0aaa Subdivision Surface: fix a serious performance hit when mixing CPU & GPU.

Subdivision surface efficiency relies on caching pre-computed topology
data for evaluation between frames. However, while eed45d2a23
introduced a second GPU subdiv evaluator type, it still only kept
one slot for caching this runtime data per mesh.

The result is that if the mesh is also needed on CPU, for instance
due to a modifier on a different object (e.g. shrinkwrap), the two
evaluators are used at the same time and fight over the single slot.
This causes the topology data to be discarded and recomputed twice
per frame.

Since avoiding duplicate evaluation is a complex task, this fix
simply adds a second separate cache slot for the GPU data, so that
the cost is simply running subdivision twice, not recomputing topology
twice.

To help diagnostics, I also add a message to show when GPU evaluation
is actually used to the modifier panel. Two frame counters are used
to suppress flicker in the UI panel.

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

Pull Request #104441

c92cae64fb Fix references to the main branch in the .gitmodules

a212d28ddf Un-ignore modules in .gitmodules configuration

The meaning of the ignore option for submodules did change since our
initial Git setup was done: back then it was affecting both diff and
stage families of Git command. Unfortunately, the actual behavior did
violate what documentation was stating (the documentation was stating
that the option only affects diff family of commands). This got fixed
in Git some time after our initial setup and it was the behavior of the
commands changed, not the documentation. This lead to a situation when
we can no longer see that submodules are modified and staged, and it is
very easy to stage the submodules.

For the clarity: diff and status are both "status" family, show and
diff are "diff" family.

Hence this change: since there is no built-in zero-configuration way
of forbidding Git from staging submodules lets make it visible and
clear what the state of submodules is.

We still need to inform people to not stage submodules, for which
we can offer some configuration tips and scripts but doing so is
outside of the scope of this change at it requires some additional
research. Current goal is simple: make it visible and clear what is
going to be committed to Git.

This is a response to an increased frequency of incidents when the
submodules are getting modified and committed without authors even
noticing this (which is also a bit annoying to recover from).

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

4390013458 Make update: Ignore submodules

The previous change in the .gitmodules made it so the `make update`
rejects to do its thing because it now sees changes in the submodules
and rejected to update, thinking there are unstaged changes.

Ignore the submodule changes, bringing the old behavior closer to
what it was.

09599edf4b Merge branch 'main' into accumulate_generic_new

Iliya Katushenock added 1 commit 2023-02-08 16:21:41 +01:00

4037b34486 checkout wrong changes

Iliya Katushenock added 1 commit 2023-02-08 17:14:01 +01:00

3328226330 try 4

Iliya Katushenock added 1 commit 2023-02-08 17:50:48 +01:00

e2e5ca83da fix!

Iliya Katushenock added 1 commit 2023-02-11 17:17:42 +01:00

0378028c85 Merge branch 'main' into accumulate_generic_new

Hans Goudey approved these changes 2023-02-13 03:12:54 +01:00

Hans Goudey left a comment

Looks good to me now.

Brecht Van Lommel added this to the Nodes & Physics project 2023-02-13 09:22:01 +01:00

Iliya Katushenock added 1 commit 2023-02-26 11:15:46 +01:00

3d303db5c9 Merge branch 'main' into accumulate_generic_new

Iliya Katushenock added 1 commit 2023-03-01 20:56:59 +01:00

8268b3780d Merge branch 'main' into accumulate_generic_new

Iliya Katushenock added 1 commit 2023-04-01 22:58:30 +02:00

af00d170ba Merge branch 'main' into accumulate_generic_new

Iliya Katushenock added 2 commits 2023-05-08 19:34:19 +02:00

ea7cb1c389 fix conflict

85354d6585 Merge branch 'accumulate_generic_new' of projects.blender.org:mod_moder/blender into accumulate_generic_new

Hans Goudey approved these changes 2023-05-08 20:35:35 +02:00

Hans Goudey changed title from ~~Cleanup: Geometry Node: Make Accumulate Attribute node more generic~~ to Cleanup: Make Accumulate Attribute node more generic

2023-05-08 20:35:45 +02:00

Hans Goudey merged commit 819cd58864 into main

2023-05-08 20:36:18 +02:00

Hans Goudey referenced this issue from a commit

2023-05-08 20:36:27 +02:00

Cleanup: Make Accumulate Attribute node more generic

Iliya Katushenock deleted branch accumulate_generic_new

2023-05-08 20:40:25 +02:00

Colin Basnett referenced this issue from a commit

2023-05-13 21:43:56 +02:00

Cleanup: Make Accumulate Attribute node more generic

Howard Trickey referenced this issue from a commit