DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

Add bl_use_materialx property #3

Merged
Bogdan Nagirniak merged 2 commits from add-bl_use_materialx into matx-export-material 2023-08-24 15:51:44 +02:00
Conversation 0 Commits 2 Files Changed 3 +2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a459bdac51 - Show all commits

2
source/blender/nodes/shader/materialx/nodes/image.cc
View File

@ -29,6 +29,8 @@ MaterialX::NodePtr MaterialXTexImageNode::convert()
Scene *scene = DEG_get_input_scene(depsgraph); Scene *scene = DEG_get_input_scene(depsgraph);
Main *bmain = DEG_get_bmain(depsgraph); Main *bmain = DEG_get_bmain(depsgraph);
std::string image_path; std::string image_path;
/* TODO: What if Blender built without Hydra? Also io::hydra::cache_or_get_image_file contain
* pretty general code, so could be moved from bf_usd project. */
#ifdef WITH_HYDRA #ifdef WITH_HYDRA
image_path = io::hydra::cache_or_get_image_file(bmain, scene, image, &tex->iuser); image_path = io::hydra::cache_or_get_image_file(bmain, scene, image, &tex->iuser);
#endif #endif