blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Hydra: saving changed to unpacking for packed images #110933

Merged
Brecht Van Lommel merged 4 commits from DagerD/blender:unpack-instead-of-save into main 2023-08-17 18:09:58 +02:00
Conversation 4 Commits 4 Files Changed 1 +32 -5
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/io/usd/hydra/image.cc
View File

@ -13,6 +13,8 @@
#include "BKE_image.h"
#include "BKE_image_format.h"
#include "BKE_image_save.h"
#include "BKE_main.h"
#include "BKE_packedFile.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
@ -76,21 +78,46 @@ static std::string cache_image_file(
std::string cache_or_get_image_file(Main *bmain, Scene *scene, Image *image, ImageUser *iuser)
{
char str[FILE_MAX];
std::string file_path;
bool do_check_extension = false;
if (image->source == IMA_SRC_GENERATED) {
file_path = cache_image_file(bmain, scene, image, iuser, false);
}
else if (BKE_image_has_packedfile(image)) {
file_path = cache_image_file(bmain, scene, image, iuser, true);
do_check_extension = true;
std::string dir_path = image_cache_file_path();
char *cached_path;
char subfolder[FILE_MAXDIR];
snprintf(subfolder, sizeof(subfolder), "unpack_%p", image);
LISTBASE_FOREACH (ImagePackedFile *, ipf, &image->packedfiles) {
DagerD marked this conversation as resolved
Brecht Van Lommel commented 2023-08-10 18:16:20 +02:00
Review
Copy Link

The returned string may be null, and if it's not null it needs to be freed.

The returned string may be null, and if it's not null it needs to be freed.
char path[FILE_MAX];
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),
DagerD marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-08-10 18:32:45 +02:00
Outdated
Review
Copy Link

This file name is not guaranteed to be unique. Maybe put all unpack files in a uniquely name subdirectory?

Something like unpack_%p with the image datablock pointer, similar to how it's done to make cached images unique.

This file name is not guaranteed to be unique. Maybe put all unpack files in a uniquely name subdirectory? Something like `unpack_%p` with the image datablock pointer, similar to how it's done to make cached images unique.
dir_path.c_str(),
path,
ipf->packedfile,
PF_WRITE_LOCAL);
/* Take first succesfully unpacked image. */
if (cached_path != nullptr) {
if (file_path.empty()) {
file_path = cached_path;
}
MEM_freeN(cached_path);
}
}
}
else {
char str[FILE_MAX];
do_check_extension = true;
BKE_image_user_file_path_ex(bmain, iuser, image, str, false, true);
file_path = str;
}
if (!pxr::HioImageRegistry::GetInstance().IsSupportedImageFile(file_path)) {
file_path = cache_image_file(bmain, scene, image, iuser, true);
}
if (do_check_extension && !pxr::HioImageRegistry::GetInstance().IsSupportedImageFile(file_path))
{
file_path = cache_image_file(bmain, scene, image, iuser, true);
}
CLOG_INFO(LOG_HYDRA_SCENE, 1, "%s -> %s", image->id.name, file_path.c_str());