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

BLEN-335: Export environment light #1

Merged
Bogdan Nagirniak merged 13 commits from BLEN-335 into hydra-render 2023-02-17 14:46:46 +01:00
Conversation 0 Commits 13 Files Changed 9 +6 -5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit acc23adaaf - Show all commits

11
source/blender/render/hydra/sceneDelegate/world.cc
View File

@ -100,17 +100,18 @@ void WorldData::set_as_world()
data[HdLightTokens->intensity] = strength[1]; data[HdLightTokens->intensity] = strength[1];
data[HdLightTokens->exposure] = 1.0f; data[HdLightTokens->exposure] = 1.0f;
data[HdLightTokens->color] = GfVec3f(color[0], color[1], color[2]); data[HdLightTokens->color] = GfVec3f(color[0], color[1], color[2]);
PyGILState_STATE gilstate;
gilstate = PyGILState_Ensure();
if (!color_input.directly_linked_links().is_empty()) { if (!color_input.directly_linked_links().is_empty()) {
bNode *color_input_node = color_input.directly_linked_links()[0]->fromnode; bNode *color_input_node = color_input.directly_linked_links()[0]->fromnode;
if (color_input_node->type == SH_NODE_TEX_IMAGE) { if (color_input_node->type == SH_NODE_TEX_IMAGE) {
NodeTexImage *tex = static_cast<NodeTexImage *>(color_input_node->storage); NodeTexImage *tex = static_cast<NodeTexImage *>(color_input_node->storage);
Image *ima = (Image *)color_input_node->id; Image *ima = (Image *)color_input_node->id;
if (ima) { if (ima) {
ReportList reports; ReportList reports;
ImageSaveOptions opts; ImageSaveOptions opts;
Main *bmain = CTX_data_main((bContext *)b_context->ptr.data); Main *bmain = CTX_data_main((bContext *)b_context->ptr.data);
if (BKE_image_save_options_init(&opts, if (BKE_image_save_options_init(&opts,
bmain, bmain,
CTX_data_scene((bContext *)b_context->ptr.data), CTX_data_scene((bContext *)b_context->ptr.data),
@ -122,7 +123,7 @@ void WorldData::set_as_world()
string image_name; string image_name;
if (ima->source == IMA_SRC_GENERATED) { if (ima->source == IMA_SRC_GENERATED) {
image_name = strcat((ima->id.name + 2), ".png"); image_name.append(ima->id.name + 2).append(".png");
} }
else { else {
image_name = ima->filepath == NULL ? image_name = ima->filepath == NULL ?
@ -136,7 +137,8 @@ void WorldData::set_as_world()
image_name.c_str()); image_name.c_str());
STRNCPY(opts.filepath, tempfile); STRNCPY(opts.filepath, tempfile);
opts.im_format.imtype = R_IMF_IMTYPE_PNG; opts.im_format.imtype = R_IMF_IMTYPE_PNG;
opts.save_copy = true;
if (BKE_image_save(&reports, bmain, ima, &tex->iuser, &opts)) { if (BKE_image_save(&reports, bmain, ima, &tex->iuser, &opts)) {
data[HdLightTokens->textureFile] = SdfAssetPath(tempfile, tempfile); data[HdLightTokens->textureFile] = SdfAssetPath(tempfile, tempfile);
} }
@ -145,7 +147,6 @@ void WorldData::set_as_world()
} }
} }
} }
PyGILState_Release(gilstate);
} }
else { else {
data[HdLightTokens->intensity] = 1.0f; data[HdLightTokens->intensity] = 1.0f;