griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Geometry Nodes: pass through in bake node if it is in a repeat zone

Browse Source 
Bake nodes are not supported in a repeat zone. They used to just output
default values when used in a repeat zone, but now they just pass-through
the inputs like an unbaked bake node would.

This makes the behavior more like one would expect when using the same
node group in and outside of a repeat zone that happens to have a bake
node inside (which is not even used).
This commit is contained in:
Jacques Lucke
2024-08-01 12:39:08 +02:00
parent c8404eb0c8
commit fe461903c1
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/nodes/geometry/nodes/node_geo_bake.cc
View File

@@ -249,6 +249,29 @@ static bake::BakeSocketConfig make_bake_socket_config(const Span<NodeGeometryBak
return config;
}
/**
* This is used when the bake node should just pass-through the data and the caller of geometry
* nodes should not have to care about this.
*/
struct DummyDataBlockMap : public bake::BakeDataBlockMap {
private:
std::mutex mutex_;
Map<bake::BakeDataBlockID, ID *> map_;
public:
ID *lookup_or_remember_missing(const bake::BakeDataBlockID &key) override
{
std::lock_guard lock{mutex_};
return map_.lookup_default(key, nullptr);
}
void try_add(ID &id) override
{
std::lock_guard lock{mutex_};
map_.add(bake::BakeDataBlockID(id), &id);
}
};
class LazyFunctionForBakeNode final : public LazyFunction {
const bNode &node_;
Span<NodeGeometryBakeItem> bake_items_;
@@ -298,7 +321,8 @@ class LazyFunctionForBakeNode final : public LazyFunction {
return;
}
if (found_id->is_in_loop) {
this->set_default_outputs(params);
DummyDataBlockMap data_block_map;
this->pass_through(params, user_data, &data_block_map);
return;
}
BakeNodeBehavior *behavior = user_data.call_data->bake_params->get(found_id->id);