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

Moved check of existing MaterialX addon from bpy_hydra.py to material.cc and log warning only once. #83

Merged
Bogdan Nagirniak merged 3 commits from hydra-matx-check into hydra-render 2023-08-02 07:45:13 +02:00
Conversation 0 Commits 3 Files Changed 2 +10 -8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d03bf65ba - Show all commits

18
source/blender/io/usd/hydra/material.cc
View File

@ -121,17 +121,19 @@ void MaterialData::export_mtlx()
if (!matx_addon_checked) { if (!matx_addon_checked) {
gstate = PyGILState_Ensure(); gstate = PyGILState_Ensure();
/* Adding second check into the lock, good practice to make this fully correct */
if (!matx_addon_checked) {
PyObject *mx_module = PyImport_ImportModule("materialx");
has_matx_addon = mx_module != nullptr;
Py_XDECREF(mx_module);
PyObject *mx_module = PyImport_ImportModule("materialx"); if (!has_matx_addon) {
has_matx_addon = mx_module != nullptr; PyErr_Print();
Py_XDECREF(mx_module); CLOG_WARN(LOG_HYDRA_SCENE, "No MaterialX addon, materials won't be exported.");
}
if (!has_matx_addon) { matx_addon_checked = true;
PyErr_Print();
CLOG_WARN(LOG_RENDER_HYDRA_SCENE, "No MaterialX addon, materials won't be exported.");
} }
PyGILState_Release(gstate); PyGILState_Release(gstate);
matx_addon_checked = true;
} }
if (!has_matx_addon) { if (!has_matx_addon) {