BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Implement Viewport render with material preview #56

Merged
Bogdan Nagirniak merged 22 commits from BLEN-421 into hydra-render 2023-06-30 09:03:28 +02:00
Conversation 1 Commits 22 Files Changed 7 +7 -5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 296bfa55e3 - Show all commits

12
source/blender/render/hydra/scene_delegate/image.cc
View File

@ -67,19 +67,21 @@ static std::string cache_image_file(Image *image,
std::string cache_or_get_image_file(Image *image, bContext *context, ImageUser *iuser) std::string cache_or_get_image_file(Image *image, bContext *context, ImageUser *iuser)
{ {
char file_path[FILE_MAX]; std::string file_path;
if (image->source == IMA_SRC_GENERATED) { if (image->source == IMA_SRC_GENERATED) {
strcpy(file_path, cache_image_file(image, context, iuser, false).c_str()); file_path = cache_image_file(image, context, iuser, false);
} }
else if (BKE_image_has_packedfile(image)) { else if (BKE_image_has_packedfile(image)) {
strcpy(file_path, cache_image_file(image, context, iuser, true).c_str()); file_path = cache_image_file(image, context, iuser, true);
} }
else { else {
char str[FILE_MAX];
Main *main = CTX_data_main(context); Main *main = CTX_data_main(context);
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 10:34:44 +02:00
Outdated
Review
Copy Link

Revert changes in this function and add

char str[FILE_MAX];
BKE_image_user_file_path_ex(main, iuser, image, str, false, true);
file_path = str;
Revert changes in this function and add ``` char str[FILE_MAX]; BKE_image_user_file_path_ex(main, iuser, image, str, false, true); file_path = str; ```
BKE_image_user_file_path_ex(main, iuser, image, file_path, false, true); BKE_image_user_file_path_ex(main, iuser, image, str, false, true);
file_path = str;
if (!pxr::HioImageRegistry::GetInstance().IsSupportedImageFile(file_path)) { if (!pxr::HioImageRegistry::GetInstance().IsSupportedImageFile(file_path)) {
strcpy(file_path, cache_image_file(image, context, iuser, true).c_str()); file_path = cache_image_file(image, context, iuser, true);
} }
} }