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

Jump to bottom

Replace references to ASCII with Text in USD binaries to account for UTF-8 support #2394

Merged
merged 2 commits into from
May 11, 2023
Merged

Replace references to ASCII with Text in USD binaries to account for UTF-8 support #2394

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
98da93c
Replace "ASCII" with "Text" in the file browser
nvmkuruc Apr 20, 2023
ae622b6
Replace "ascii" with "text" in `usddiff` comment
nvmkuruc Apr 20, 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
2 changes: 1 addition & 1 deletion pxr/usd/bin/usddiff/usddiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def _exit(msg, exitCode):
sys.exit(exitCode)

# generates a command list representing a call which will generate
# a temporary ascii file used during diffing.
# a temporary text file used during diffing.
def _generateCatCommand(usdcatCmd, inPath, outPath, flatten=None, fmt=None):
command = [usdcatCmd, inPath, '--out', outPath]
if flatten:
Expand Down
2 changes: 1 addition & 1 deletion pxr/usdImaging/usdviewq/appController.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,7 @@ def _getSaveFileName(self, caption, recommendedFilename):
caption,
'./' + recommendedFilename,
'USD Files (*.usd)'
';;USD ASCII Files (*.usda)'
';;USD Text Files (*.usda)'
';;USD Crate Files (*.usdc)'
';;Any USD File (*.usd *.usda *.usdc)',
'Any USD File (*.usd *.usda *.usdc)')
Expand Down