Skip to content

EMSUSD-3870 - MAYA Integration : Fix lib name for RenderSetup #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seando-adsk merged 1 commit into from
Jun 26, 2026
Merged

EMSUSD-3870 - MAYA Integration : Fix lib name for RenderSetup #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmake/modules/FindAdskUsdRenderSetup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ message(STATUS "Finding Autodesk USD Render Setup")

find_path(ADSK_USD_RENDER_SETUP_INCLUDE_DIR
NAMES
RenderSetup/RenderSetupVersion.h
AdskUsdRenderSetup/AdskUsdRenderSetupVersion.h
HINTS
$ENV{ADSK_USD_RENDER_SETUP_ROOT_DIR}
${ADSK_USD_RENDER_SETUP_ROOT_DIR}
Expand All @@ -29,7 +29,7 @@ find_path(ADSK_USD_RENDER_SETUP_INCLUDE_DIR

find_library(ADSK_USD_RENDER_SETUP_LIBRARY
NAMES
RenderSetup
AdskUsdRenderSetup
HINTS
$ENV{ADSK_USD_RENDER_SETUP_ROOT_DIR}
${ADSK_USD_RENDER_SETUP_ROOT_DIR}
Expand All @@ -44,9 +44,10 @@ find_library(ADSK_USD_RENDER_SETUP_LIBRARY
# Render Setup version

if(ADSK_USD_RENDER_SETUP_INCLUDE_DIR)
set(adsk_rs_version_header "${ADSK_USD_RENDER_SETUP_INCLUDE_DIR}/AdskUsdRenderSetup/AdskUsdRenderSetupVersion.h")
file(
STRINGS
${ADSK_USD_RENDER_SETUP_INCLUDE_DIR}/RenderSetup/RenderSetupVersion.h
${adsk_rs_version_header}
ADSK_USD_RENDER_SETUP_VERSION
REGEX "define RENDER_SETUP_VERSION .*")
if(ADSK_USD_RENDER_SETUP_VERSION)
Expand Down
4 changes: 2 additions & 2 deletions lib/usd/ui/renderSetup/mayaEditCommitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#include <pxr/usd/usd/stage.h>

#include <AdskUsdRenderSetup/HostStage.h>
#include <AdskUsdRenderSetup/IEditCommitter.h>
#include <QtCore/QObject>
#include <RenderSetup/HostStage.h>
#include <RenderSetup/IEditCommitter.h>

#include <functional>
#include <string>
Expand Down
11 changes: 8 additions & 3 deletions lib/usd/ui/renderSetup/renderSetupWindowCmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "mayaEditCommitter.h"

#include <mayaUsd/nodes/proxyShapeBase.h>
#include <mayaUsd/nodes/usdSceneSettingsManager.h>
#include <mayaUsd/ufe/Utils.h>
#include <mayaUsd/utils/mayaNodeTypeObserver.h>

Expand All @@ -34,23 +33,29 @@
#include <maya/MSceneMessage.h>
#include <maya/MSyntax.h>

#include <AdskUsdRenderSetup/RenderSetupWidget.h>
#include <QtCore/QPointer>
#include <QtCore/QTimer>
#include <QtGui/QAction>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenuBar>
#include <QtWidgets/QVBoxLayout>
#include <RenderSetup/RenderSetupWidget.h>

#include <algorithm>
#include <vector>

#ifdef MAYA_HAS_USD_SETTINGS_NODES
#include <mayaUsd/nodes/usdSceneSettingsManager.h>
#endif
Comment thread
seando-adsk marked this conversation as resolved.

namespace MAYAUSD_NS_DEF {

class RenderSetupWindow;

const MString RenderSetupWindowCmd::commandName("mayaUsdRenderSetupWindow");
const MString RenderSetupWindowCmd::commandName("mayaUsdRenderSetupWindow");
#ifdef MAYA_HAS_USD_SETTINGS_NODES
const std::string kUSDRenderSettingsNodeName("UsdDefaultRenderSettings");
#endif

namespace {
constexpr auto kReloadFlag = "-rl";
Expand Down
2 changes: 1 addition & 1 deletion test/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ else()
endif()

if (AdskUsdRenderSetup_FOUND)
mayaUsd_get_unittest_target(target testUsdRenderSetup.py)
mayaUsd_get_unittest_target(target testAdskUsdRenderSetup.py)
Comment thread
seando-adsk marked this conversation as resolved.
mayaUsd_add_test(${target}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
PYTHON_MODULE ${target}
Expand Down
18 changes: 18 additions & 0 deletions test/lib/testUsdRenderSetup.py → test/lib/testAdskUsdRenderSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import maya.cmds as cmds
import maya.mel as mel

from mayaUsd.lib import UsdDefaultRenderSettings

class VerifyUsdRenderSetupTestCase(unittest.TestCase):
""" Test the Usd Render Setup. """

Expand All @@ -33,3 +35,19 @@ def setUpClass(cls):
def testWindowCommandExists(self):
# Verify that the render setup window command exists, which indicates that the render setup UI is available.
self.assertTrue(mel.eval('exists mayaUsdRenderSetupWindow'))

def testPythonBindings(self):
# Verify that we can load the python bindings and call at least one method.
try:
import AdskUsdRenderSetup as rs
except ImportError as e:
self.fail(f"Failed to import my_module: {e}")

self.assertEqual(rs.__name__, 'AdskUsdRenderSetup')
self.assertTrue(rs.__version_info__ >= (0, 0, 1))

stage = UsdDefaultRenderSettings.getUsdStage()
self.assertIsNotNone(rs.GetAllRenderSettingsPaths(stage))

prim = rs.GetActiveRenderSettings(stage)
self.assertTrue(prim)
Comment thread
seando-adsk marked this conversation as resolved.
Loading