blender
/
blender
137
411
Fork 594
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Hydra render engine #104712

Closed
Bogdan Nagirniak wants to merge 142 commits from BogdanNagirniak/blender:hydra-render into main
pull from: BogdanNagirniak/blender:hydra-render
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 31 Commits 142 Files Changed 65 +3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 81316af497 - Show all commits

3
source/creator/CMakeLists.txt
View File

@ -1573,6 +1573,7 @@ if((DEFINED LIBDIR) AND TARGETDIR_LIB)
DESTINATION ${TARGETDIR_LIB}
)
install(DIRECTORY
${LIBDIR}/usd/plugin/usd/hdStorm
${LIBDIR}/usd/plugin/usd/usdShaders
BogdanNagirniak marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-03-11 00:47:54 +01:00
Outdated
Review
Copy Link

blender.shared is Windows specific. Please fold this into the code a few lines above that has conditions for various platforms.

Is there any reason just these two plugins are copied, and hioOiio and sdrGlslfx are not? We might as well be complete.

It's also not clear to me if the right thing is to put these plugins in the same folder as the other ones? It's unclear to me why USD put them in a separate folder to begin with, maybe there's a good reason though maybe there's also not and this is fine.

`blender.shared` is Windows specific. Please fold this into the code a few lines above that has conditions for various platforms. Is there any reason just these two plugins are copied, and `hioOiio` and `sdrGlslfx` are not? We might as well be complete. It's also not clear to me if the right thing is to put these plugins in the same folder as the other ones? It's unclear to me why USD put them in a separate folder to begin with, maybe there's a good reason though maybe there's also not and this is fine.
${LIBDIR}/usd/plugin/usd/hioOiio
DESTINATION "./blender.shared/usd"
@ -1583,6 +1584,7 @@ if((DEFINED LIBDIR) AND TARGETDIR_LIB)
DESTINATION ${TARGETDIR_LIB}
)
install(DIRECTORY
${LIBDIR}/usd/plugin/usd/hdStorm
${LIBDIR}/usd/plugin/usd/usdShaders
DESTINATION ${TARGETDIR_LIB}/usd
)
@ -1592,6 +1594,7 @@ if((DEFINED LIBDIR) AND TARGETDIR_LIB)
DESTINATION "${TARGETDIR_VER}/datafiles"
)
install(DIRECTORY
${LIBDIR}/usd/plugin/usd/hdStorm
${LIBDIR}/usd/plugin/usd/usdShaders
DESTINATION "${TARGETDIR_VER}/datafiles/usd"
)