Skip to content
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

EMSUSD-254 disable the default prim auto-filling. #3427

Merged
merged 2 commits into from
Nov 1, 2023
Merged

EMSUSD-254 disable the default prim auto-filling. #3427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
604bd69
EMSUSD-254 disable the default prim auto-filling.
pierrebai-adsk Oct 31, 2023
9fefc4d
EMSUSD-254 properly resetting the field when requested
pierrebai-adsk Oct 31, 2023
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
8 changes: 5 additions & 3 deletions lib/mayaUsd/resources/scripts/mayaUsdLibRegisterStrings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ def mayaUsdLibRegisterStrings():
register('kTextVariant', 'Variant')
register('kTextVariantToolTip','If selected, your Maya reference will be defined in a variant. This will enable your prim to\nhave 2 variants you can switch between in the Outliner; the Maya reference and its USD cache.')

register('kAddRefOrPayloadPrimPathToolTip', 'Specifying a prim path will make an explicit reference to a prim.\n' +
'If there is no default prim in your chosen reference, this field auto populates with the top level prim for you to reference in.\n' +
'If the field is left blank, no prim will be referenced.')
register('kAddRefOrPayloadPrimPathToolTip',
'Leave this field blank to use the default prim as your prim path (only viable if your file has a default prim).\n' +
'Specifying a prim path will make an explicit reference to a prim.\n' +
'If there is no default prim and no prim path is specified, no prim will be referenced.')

register('kAddRefOrPayloadPrimPathLabel', 'Prim Path')
register('kAddRefOrPayloadPrimPathPlaceHolder', ' (Default Prim)')
register('kAddRefOrPayloadPrimPathHelpLabel', 'Help on Select a Prim for Reference')
Expand Down
60 changes: 33 additions & 27 deletions lib/mayaUsd/resources/scripts/mayaUsdMayaReferenceUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,25 +153,28 @@ def _resetReferencedPrim(*args):
"""Reset the referenced prim UI"""
_updateReferencedPrimBasedOnFile()

def _getDefaultAndRootPrims(filename):
"""Retrieve the default and first root prims of a USD file."""
defPrim, rootPrim = None, None
try:
layer = Sdf.Layer.FindOrOpen(filename)
if layer:
# Note: the root prims at the USD layer level are SdfPrimSpec,
# so they are not SdfPath themselves nor prim. That is
# why their path is retrieved via their path property.
#
# The default prim is a pure token though, because it is
# a metadata on the layer, so it can be used as-is.
rootPrims = layer.rootPrims
rootPrim = rootPrims[0].path if len(rootPrims) > 0 else None
defPrim = layer.defaultPrim
except Exception as ex:
print(str(ex))

return defPrim, rootPrim
# Note: we are disabling the default prim filling due to the long delay when the USD
# file is very large.
#
# def _getDefaultAndRootPrims(filename):
# """Retrieve the default and first root prims of a USD file."""
# defPrim, rootPrim = None, None
# try:
# layer = Sdf.Layer.FindOrOpen(filename)
# if layer:
# # Note: the root prims at the USD layer level are SdfPrimSpec,
# # so they are not SdfPath themselves nor prim. That is
# # why their path is retrieved via their path property.
# #
# # The default prim is a pure token though, because it is
# # a metadata on the layer, so it can be used as-is.
# rootPrims = layer.rootPrims
# rootPrim = rootPrims[0].path if len(rootPrims) > 0 else None
# defPrim = layer.defaultPrim
# except Exception as ex:
# print(str(ex))
#
# return defPrim, rootPrim

def _updateReferencedPrimBasedOnFile():
"""Update all UI related to the referenced prim based on the currently selected file."""
Expand All @@ -187,14 +190,17 @@ def _updateReferencedPrimBasedOnFile():
cmds.button('mayaUsdAddRefOrPayloadFilePathBrowser', edit=True, enable=True)
cmds.symbolButton('mayaUsdAddRefOrPayloadFilePathReset', edit=True, enable=True)

defaultPrim, rootPrim = _getDefaultAndRootPrims(filename)
if defaultPrim:
placeHolder = defaultPrim + getMayaUsdLibString('kAddRefOrPayloadPrimPathPlaceHolder')
cmds.textFieldGrp('mayaUsdAddRefOrPayloadPrimPath', edit=True, text='', placeholderText=placeHolder)
elif rootPrim:
cmds.textFieldGrp('mayaUsdAddRefOrPayloadPrimPath', edit=True, text=rootPrim, placeholderText='')
else:
cmds.textFieldGrp('mayaUsdAddRefOrPayloadPrimPath', edit=True, text='', placeholderText='')
# Note: we are disabling the default prim filling due to the long delay when the USD
# file is very large.
#
# defaultPrim, rootPrim = _getDefaultAndRootPrims(filename)
# if defaultPrim:
# placeHolder = defaultPrim + getMayaUsdLibString('kAddRefOrPayloadPrimPathPlaceHolder')
# cmds.textFieldGrp('mayaUsdAddRefOrPayloadPrimPath', edit=True, text='', placeholderText=placeHolder)
# elif rootPrim:
# cmds.textFieldGrp('mayaUsdAddRefOrPayloadPrimPath', edit=True, text=rootPrim, placeholderText='')
# else:
cmds.textFieldGrp('mayaUsdAddRefOrPayloadPrimPath', edit=True, text='', placeholderText='')

def createUsdRefOrPayloadUI(uiForLoad=False):
_setCurrentFilename(None)
Expand Down
Loading