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 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f94cdd9e0b - Show all commits

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

@ -75,8 +75,8 @@ std::string cache_or_get_image_file(Image *image, bContext *context, ImageUser *
file_path = cache_image_file(image, context, iuser, true); 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);
char str[FILE_MAX];
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, str, false, true); BKE_image_user_file_path_ex(main, iuser, image, str, false, true);
file_path = str; file_path = str;
@ -85,7 +85,7 @@ std::string cache_or_get_image_file(Image *image, bContext *context, ImageUser *
} }
} }
CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s -> %s", image->id.name, file_path); CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s -> %s", image->id.name, file_path.c_str());
return file_path; return file_path;
} }

2
source/blender/render/hydra/scene_delegate/world.cc
View File

@ -45,7 +45,7 @@ void WorldData::init()
data_[pxr::UsdLuxTokens->orientToStageUpAxis] = true; data_[pxr::UsdLuxTokens->orientToStageUpAxis] = true;
float intensity = 1.0f; float intensity = 1.0f;
float exposure = 0.0f; float exposure = 1.0f;
pxr::GfVec3f color(1.0f, 1.0f, 1.0f); pxr::GfVec3f color(1.0f, 1.0f, 1.0f);
pxr::SdfAssetPath texture_file; pxr::SdfAssetPath texture_file;