Cleanup: format
This commit is contained in:
@@ -40,4 +40,4 @@ blender::bke::greasepencil::TreeNode &TreeElementGreasePencilNode::node() const
|
||||
return node_;
|
||||
}
|
||||
|
||||
} // namespace blender::ed::outliner
|
||||
} // namespace blender::ed::outliner
|
||||
|
||||
@@ -26,4 +26,4 @@ class TreeElementIDGreasePencil final : public TreeElementID {
|
||||
void expand_layer_tree(SpaceOutliner &) const;
|
||||
};
|
||||
|
||||
} // namespace blender::ed::outliner
|
||||
} // namespace blender::ed::outliner
|
||||
|
||||
@@ -92,13 +92,14 @@ std::string cache_or_get_image_file(Main *bmain, Scene *scene, Image *image, Ima
|
||||
snprintf(subfolder, sizeof(subfolder), "unpack_%p", image);
|
||||
LISTBASE_FOREACH (ImagePackedFile *, ipf, &image->packedfiles) {
|
||||
char path[FILE_MAX];
|
||||
BLI_path_join(path, sizeof(path), dir_path.c_str(), subfolder, BLI_path_basename(ipf->filepath));
|
||||
BLI_path_join(
|
||||
path, sizeof(path), dir_path.c_str(), subfolder, BLI_path_basename(ipf->filepath));
|
||||
cached_path = BKE_packedfile_unpack_to_file(nullptr,
|
||||
BKE_main_blendfile_path(bmain),
|
||||
dir_path.c_str(),
|
||||
path,
|
||||
ipf->packedfile,
|
||||
PF_WRITE_LOCAL);
|
||||
BKE_main_blendfile_path(bmain),
|
||||
dir_path.c_str(),
|
||||
path,
|
||||
ipf->packedfile,
|
||||
PF_WRITE_LOCAL);
|
||||
|
||||
/* Take first succesfully unpacked image. */
|
||||
if (cached_path != nullptr) {
|
||||
|
||||
@@ -112,4 +112,4 @@ bool Render::prepare_viewlayer(struct ViewLayer *view_layer, struct Depsgraph *d
|
||||
}
|
||||
|
||||
return prepare_viewlayer_cb(prepare_vl_handle, view_layer, depsgraph);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user