blender/blender
150
479
Fork 710
Code Issues 6.8k Pull Requests 897 Projects 18 Wiki Activity

Geometry Nodes: new Bake node #115466

Merged
Jacques Lucke merged 93 commits from JacquesLucke/blender:bake-geometry-nodes into main 2023-12-18 13:01:16 +01:00
Conversation 19 Commits 93 Files Changed 33 +11 -8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ceb2024670 - Show all commits

19
source/blender/editors/space_action/action_draw.cc
View File

@ -885,10 +885,8 @@ void timeline_draw_cache(const SpaceAction *saction, const Object *ob, const Sce
const blender::bke::bake::ModifierCache &modifier_cache = *nmd->runtime->cache;
{
std::lock_guard lock{modifier_cache.mutex};
for (const std::unique_ptr<blender::bke::bake::SimulationNodeCache> &node_cache_ptr :
modifier_cache.simulation_cache_by_id.values())
{
const blender::bke::bake::SimulationNodeCache &node_cache = *node_cache_ptr;
for (const auto item : modifier_cache.simulation_cache_by_id.items()) {
const blender::bke::bake::SimulationNodeCache &node_cache = *item.value;
if (node_cache.bake.frames.is_empty()) {
all_simulations_baked = false;
continue;
@ -898,10 +896,15 @@ void timeline_draw_cache(const SpaceAction *saction, const Object *ob, const Sce
}
cache_ranges.append({node_cache.bake.frame_range(), node_cache.cache_status});
}
for (const std::unique_ptr<blender::bke::bake::BakeNodeCache> &node_cache_ptr :
modifier_cache.bake_cache_by_id.values())
{
const blender::bke::bake::BakeNodeCache &node_cache = *node_cache_ptr;
for (const auto item : modifier_cache.bake_cache_by_id.items()) {
const NodesModifierBake *bake = nmd->find_bake(item.key);
if (!bake) {
continue;
}
if (bake->flag & NODES_MODIFIER_BAKE_STILL) {
continue;
}
const blender::bke::bake::BakeNodeCache &node_cache = *item.value;
if (node_cache.bake.frames.is_empty()) {
continue;
}