diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-21 18:20:05 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-21 18:35:09 +0300 |
commit | 8369adabc0ec7a1fce248b688bf20860ae0434bb (patch) | |
tree | af767efe8c6765c5876391a5eb96923fc8d6ac68 /source/blender/functions/FN_multi_function_network.hh | |
parent | 6c7e62ef9be564fbee279c7467c9b6adaf51b6c8 (diff) |
Particles: initial object socket and emitter node support
Object sockets work now, but only the new Object Transforms and the
Particle Mesh Emitter node use it. The emitter does not actually
use the mesh surface yet. Instead, new particles are just emitted around
the origin of the object.
Internally, handles to object data blocks are passed around in the network,
instead of raw object pointers. Using handles has a couple of benefits:
* The caller of the function has control over which handles can be resolved
and therefore limit access to specific data. The set of data blocks that
is accessed by a node tree should be known statically. This is necessary
for a proper integration with the dependency graph.
* When the pointer to an object changes (e.g. after restarting Blender),
all handles are still valid.
* When an object is deleted, the handle is invalidated without causing crashes.
* The handle is just an integer that can be stored per particle and can be cached easily.
The mapping between handles and their corresponding data blocks is
stored in the Simulation data block.
Diffstat (limited to 'source/blender/functions/FN_multi_function_network.hh')
-rw-r--r-- | source/blender/functions/FN_multi_function_network.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/functions/FN_multi_function_network.hh b/source/blender/functions/FN_multi_function_network.hh index f6d6c7417e7..20f8fb2ee43 100644 --- a/source/blender/functions/FN_multi_function_network.hh +++ b/source/blender/functions/FN_multi_function_network.hh @@ -95,7 +95,7 @@ class MFNode : NonCopyable, NonMovable { Span<MFOutputSocket *> outputs(); Span<const MFOutputSocket *> outputs() const; - bool all_inputs_have_origin() const; + bool has_unlinked_inputs() const; private: void destruct_sockets(); @@ -341,14 +341,14 @@ inline Span<const MFOutputSocket *> MFNode::outputs() const return outputs_; } -inline bool MFNode::all_inputs_have_origin() const +inline bool MFNode::has_unlinked_inputs() const { for (const MFInputSocket *socket : inputs_) { if (socket->origin() == nullptr) { - return false; + return true; } } - return true; + return false; } /* -------------------------------------------------------------------- |