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

Geometry Nodes: fix linked bake is not loaded

Browse Source
This commit is contained in:
Jacques Lucke
2024-01-31 12:32:27 +01:00
parent 51aac62006
commit dca80b9bc2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc
View File

@@ -98,14 +98,13 @@ std::optional<std::string> get_modifier_bake_path(const Main &bmain,
const Object &object,
const NodesModifierData &nmd)
{
const StringRefNull bmain_path = BKE_main_blendfile_path(&bmain);
if (bmain_path.is_empty()) {
return std::nullopt;
}
if (StringRef(nmd.bake_directory).is_empty()) {
return std::nullopt;
}
const char *base_path = ID_BLEND_PATH(&bmain, &object.id);
if (StringRef(base_path).is_empty()) {
return std::nullopt;
}
char absolute_bake_dir[FILE_MAX];
STRNCPY(absolute_bake_dir, nmd.bake_directory);
BLI_path_abs(absolute_bake_dir, base_path);
@@ -126,6 +125,9 @@ std::optional<bake::BakePath> get_node_bake_path(const Main &bmain,
return std::nullopt;
}
const char *base_path = ID_BLEND_PATH(&bmain, &object.id);
if (StringRef(base_path).is_empty()) {
return std::nullopt;
}
char absolute_bake_dir[FILE_MAX];
STRNCPY(absolute_bake_dir, bake->directory);
BLI_path_abs(absolute_bake_dir, base_path);