Details

Reviewers

Brecht Van Lommel (brecht)
Bastien Montagne (mont29)

Commits

rB2b2d3c14fe1a: Simulations: Embed simulation node tree in simulation data block

Summary

This also shows the node tree in the Simulation Editor.
There is a new operator to add a simulation.

One debatable aspect of this patch is how I integrated the SpaceNodeEditor.simulation
property in RNA. I decided to wrap the existing id property, because the description
says Data-block whose nodes are being edited, which is exactly what is happening here.

I'm also not sure if more changes are necessary for the node tree embedding. I feels too easy. Maybe @Bastien Montagne (mont29) can give me a hint?
For now it behaves as I'd expect, but since I can't do much with the data block yet, I cannot test many things.

This is how the header in the Simulation Editor (node editor) looks like:

This is part of T73324.

Diff Detail

Repository

rB Blender

Branch

embedded_simulation_node_tree (branched from master)

Build Status

Buildable 7514
Build 7514: arc lint + arc unit

Event Timeline

Jacques Lucke (JacquesLucke) created this revision.Apr 1 2020, 12:17 PM

Harbormaster completed remote builds in B7401: Diff 23339.Apr 1 2020, 12:17 PM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Apr 1 2020, 12:32 PM

Jacques Lucke (JacquesLucke) added reviewers: Brecht Van Lommel (brecht), Bastien Montagne (mont29).

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

Jacques Lucke (JacquesLucke) added a parent revision: D7287: Add simulation node tree type.

Jacques Lucke (JacquesLucke) added a subscriber: Bastien Montagne (mont29).

update for latest master

Harbormaster completed remote builds in B7477: Diff 23468.Apr 6 2020, 12:08 PM

Jacques Lucke (JacquesLucke) added a child revision: D7347: New Object and Image socket types.Apr 6 2020, 1:25 PM

Generally LGTM from quick look, besides one obvious thing missing: handling of this new nodetree in lib_query.c code... ;)

Also discovered something very suspicious in copying code, but that seems to be shared by existing code as well, so will investigate that separately.

source/blender/blenkernel/intern/simulation.cc
64–67	Uuuuuhhhhh… This call looks horribly suspicious to me, looks like it is creating the copy of nodetree in bmain… But this is not related to that patch, others (material e.g.) do the same, so that's something I’ll have to check outside of it…

This revision now requires changes to proceed.Apr 6 2020, 3:10 PM

handle node tree in lib_query.c

Harbormaster completed remote builds in B7483: Diff 23482.Apr 6 2020, 3:22 PM

bring back a break

Harbormaster completed remote builds in B7484: Diff 23483.Apr 6 2020, 3:22 PM

Jacques Lucke (JacquesLucke) added inline comments.Apr 6 2020, 3:23 PM

source/blender/blenkernel/intern/simulation.cc
64–67	Please let me know when you fixed that in master. I'll update this patch afterwards.

Brecht Van Lommel (brecht) accepted this revision.Apr 6 2020, 5:46 PM

add simulation node trees to node tree iterator
Merge branch 'simulation-tree-arc' into embedded_simulation_node_tree

Harbormaster completed remote builds in B7514: Diff 23584.Apr 9 2020, 11:34 AM

Bastien Montagne (mont29) accepted this revision.Apr 9 2020, 11:53 AM

Bastien Montagne (mont29) added inline comments.

source/blender/blenkernel/intern/simulation.cc
64–67	Actually you can scratch that, had to look again at the code, but we ensure that `LIB_EMBEDDED_DATA` IDs are never added to the bmain (they get special treatment in `BKE_libblock_copy_ex()`...).

This revision is now accepted and ready to land.Apr 9 2020, 11:53 AM

Closed by commit rB2b2d3c14fe1a: Simulations: Embed simulation node tree in simulation data block (authored by Jacques Lucke (JacquesLucke)). · Explain WhyApr 20 2020, 1:12 PM

This revision was automatically updated to reflect the committed changes.

Jacques Lucke (JacquesLucke) added a commit: rB2b2d3c14fe1a: Simulations: Embed simulation node tree in simulation data block.

Embed simulation node tree in simulation data block
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 23584

release/scripts/startup/bl_operators/init.py

release/scripts/startup/bl_operators/simulation.py

release/scripts/startup/bl_ui/space_node.py

release/scripts/startup/nodeitems_builtins.py

source/blender/blenkernel/BKE_node.h

source/blender/blenkernel/intern/lib_query.c

source/blender/blenkernel/intern/node.c

source/blender/blenkernel/intern/simulation.cc

source/blender/blenloader/intern/writefile.c

source/blender/makesdna/DNA_simulation_types.h

source/blender/makesrna/intern/rna_simulation.c

source/blender/makesrna/intern/rna_space.c

Embed simulation node tree in simulation data blockClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23584

release/scripts/startup/bl_operators/__init__.py

release/scripts/startup/bl_operators/simulation.py

release/scripts/startup/bl_ui/space_node.py

release/scripts/startup/nodeitems_builtins.py

source/blender/blenkernel/BKE_node.h

source/blender/blenkernel/intern/lib_query.c

source/blender/blenkernel/intern/node.c

source/blender/blenkernel/intern/simulation.cc

source/blender/blenloader/intern/writefile.c

source/blender/makesdna/DNA_simulation_types.h

source/blender/makesrna/intern/rna_simulation.c

source/blender/makesrna/intern/rna_space.c

Embed simulation node tree in simulation data block
ClosedPublic
Actions

Revision Contents
Changeset List

release/scripts/startup/bl_operators/init.py