Skip to content

Commit

Permalink
Merge branch 'dev' into degiroa/MAYA-127428/missing-metadata-notifica…
Browse files Browse the repository at this point in the history
…tion
  • Loading branch information
alicedegirolamo committed Jan 31, 2023
2 parents 2be22ac + 4bbc17f commit 4c37204
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion plugin/adsk/scripts/mayaUSDRegisterStrings.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ def mayaUSDRegisterStrings():
register("kDiscardStageEditsReloadMsg", "Are you sure you want to reload ^1s as the stage source?\n\nAll edits on your layers (except the session layer) in ^2s will be discarded.")
register("kLoadUSDFile", "Load USD File")
register("kFileOptions", "File Options")
register("kMakePathRelativeToSceneFile", "Make Path Relative to Scene File Directory")
register("kMakePathRelativeToSceneFile", "Make Path Relative to Scene File")
register("kMakePathRelativeToSceneFileAnn", "If enabled, path will be relative to your Maya scene file. If this option is disabled, there is no Maya scene file and the path will be absolute. Save your Maya scene file to disk to make this option available.")
3 changes: 2 additions & 1 deletion plugin/adsk/scripts/mayaUsd_USDRootFileRelative.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@ def uiCreate(cls, parentLayout):

kFileOptionsStr = getMayaUsdString("kFileOptions")
kMakePathRelativeStr = getMayaUsdString("kMakePathRelativeToSceneFile")
kMakePathRelativeAnnStr = getMayaUsdString("kMakePathRelativeToSceneFileAnn")

optBoxMarginWidth = mel.eval('global int $gOptionBoxTemplateDescriptionMarginWidth; $gOptionBoxTemplateDescriptionMarginWidth += 0')
cmds.setParent(topForm)
cmds.frameLayout(label=kFileOptionsStr, collapsable=False)
widgetColumn = cmds.columnLayout()
cmds.checkBox(cls.kMakePathRelativeCheckBox, label=kMakePathRelativeStr)
cmds.checkBox(cls.kMakePathRelativeCheckBox, label=kMakePathRelativeStr, ann=kMakePathRelativeAnnStr)

@classmethod
def uiInit(cls, parentLayout, filterType):
Expand Down

0 comments on commit 4c37204

Please sign in to comment.