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

BLEN-356: Automatically configure PXR_MTLX_STDLIB_SEARCH_PATHS #9

Merged
Bogdan Nagirniak merged 4 commits from blen-356-pxr_mtlx_stdlib_search_paths into hydra-render 2023-03-06 17:29:17 +01:00
Conversation 0 Commits 4 Files Changed 1 +6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46cf1e17f3 - Show all commits

4
source/creator/CMakeLists.txt
View File

@ -1513,6 +1513,10 @@ if(WITH_USD)
absolute_include_dirs(../blender/io/usd) absolute_include_dirs(../blender/io/usd)
endif() endif()
if(WITH_MATERIALX)
add_definitions(-DWITH_MATERIALX)
endif()
# Always install USD shared library and datafiles regardless if Blender # Always install USD shared library and datafiles regardless if Blender
# itself uses them, the bundled Python module still needs it. # itself uses them, the bundled Python module still needs it.
if((DEFINED LIBDIR) AND TARGETDIR_LIB) if((DEFINED LIBDIR) AND TARGETDIR_LIB)

2
source/creator/creator.c
View File

@ -477,8 +477,10 @@ int main(int argc,
#ifdef WITH_USD #ifdef WITH_USD
USD_ensure_plugin_path_registered(); USD_ensure_plugin_path_registered();
# ifdef WITH_MATERIALX
George-Shakula marked this conversation as resolved
Bogdan Nagirniak commented 2023-03-03 09:55:04 +01:00
Review
Copy Link

do we need #ifdef WITH_MATERIALX ?

do we need `#ifdef WITH_MATERIALX` ?
George-Shakula commented 2023-03-03 10:05:43 +01:00
Review
Copy Link

It's not a requirement but it makes sense to wrap it into an #ifdef. Because if there is no mtlx there is also no usdMtlx

It's not a requirement but it makes sense to wrap it into an #ifdef. Because if there is no mtlx there is also no usdMtlx
USD_setup_usd_mtlx_environment(); USD_setup_usd_mtlx_environment();
# endif # endif
#endif
#ifndef WITH_PYTHON_MODULE #ifndef WITH_PYTHON_MODULE
/* First test for background-mode (#Global.background) */ /* First test for background-mode (#Global.background) */