Merge branch 'AcademySoftwareFoundation:main' into root_input_fixes

Author: kwokcb

CMakeLists.txt

@@ -698,3 +698,8 @@ if(NOT SKBUILD)
             "${PROJECT_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}Config.cmake"
             DESTINATION "${MATERIALX_GEN_CONFIG_PATH}")
 endif()
+
+# Run pip install after all install steps
+if(MATERIALX_BUILD_PYTHON AND MATERIALX_INSTALL_PYTHON AND PYTHON_EXECUTABLE AND NOT SKBUILD)
+    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install . WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/python)")
+endif()

python/CMakeLists.txt

@@ -14,5 +14,4 @@ endif()
 if(MATERIALX_INSTALL_PYTHON AND PYTHON_EXECUTABLE AND NOT SKBUILD)
   set(PYPROJECT_TOML "${CMAKE_INSTALL_PREFIX}/python/pyproject.toml")
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyproject.toml.in" "${PYPROJECT_TOML}")
-  install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install . WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/python)")
 endif()

source/PyMaterialX/PyMaterialXRenderMsl/PyMslRenderer.mm

@@ -16,6 +16,7 @@ void bindPyMslRenderer(py::module& mod)
     py::class_<mx::MslRenderer, mx::ShaderRenderer, mx::MslRendererPtr>(mod, "MslRenderer")
         .def_static("create", &mx::MslRenderer::create)
         .def("initialize", &mx::MslRenderer::initialize, py::arg("renderContextHandle") = nullptr)
+        .def("createImageHandler", &mx::MslRenderer::createImageHandler)
         .def("createProgram", static_cast<void (mx::MslRenderer::*)(const mx::ShaderPtr)>(&mx::MslRenderer::createProgram))
         .def("createProgram", static_cast<void (mx::MslRenderer::*)(const mx::MslRenderer::StageMap&)>(&mx::MslRenderer::createProgram))
         .def("validateInputs", &mx::MslRenderer::validateInputs)