From fe387b27c869b8c0c3a849901171904fe025e794 Mon Sep 17 00:00:00 2001
From: Sean Donnelly <23455376+seando-adsk@users.noreply.github.com>
Date: Fri, 31 Mar 2023 10:49:12 -0400
Subject: [PATCH 1/3] Updating docs with Maya 2024.
---
.github/ISSUE_TEMPLATE/bug_report.md | 4 ++--
.github/ISSUE_TEMPLATE/build-issue-report.md | 4 ++--
README_DOC.md | 3 ++-
doc/build.md | 15 ++++++++-------
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3a9fd6df02..c15266d2c9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,8 +25,8 @@ If applicable, add screenshots, sample files, etc to help explain your problem.
**Specs (if applicable):**
- OS & version [e.g. Windows 10]
- - Compiler & version [e.g. gcc 6.3.1]
- - Maya version [e.g. Maya 2020]
+ - Compiler & version [e.g. gcc 11.2.1]
+ - Maya version [e.g. Maya 2024]
- Maya USD commit SHA [e.g. dev at caa921c1]
- Pixar USD commit SHA [e.g. dev at b85ddac2]
diff --git a/.github/ISSUE_TEMPLATE/build-issue-report.md b/.github/ISSUE_TEMPLATE/build-issue-report.md
index 69d0d0396f..0dab12e6af 100644
--- a/.github/ISSUE_TEMPLATE/build-issue-report.md
+++ b/.github/ISSUE_TEMPLATE/build-issue-report.md
@@ -15,8 +15,8 @@ Please attach a build_log.txt
**Specs:**
- OS & version [e.g. Windows 10]
- - Compiler & version [e.g. gcc 6.3.1]
- - Maya version [e.g. Maya 2020]
+ - Compiler & version [e.g. gcc 11.2.1]
+ - Maya version [e.g. Maya 2024]
- Maya USD commit SHA [e.g. dev at caa921c1]
- Pixar USD commit SHA [e.g. dev at b85ddac2]
diff --git a/README_DOC.md b/README_DOC.md
index 05bdb4c3b6..c5a5fdaa2c 100644
--- a/README_DOC.md
+++ b/README_DOC.md
@@ -1,6 +1,7 @@
## Plugin Documentation
+ [Getting Started with USD in Maya 2022](https://help.autodesk.com/view/MAYAUL/2022/ENU/?guid=GUID-36CFE2C3-766F-4B00-8464-E94F95E7AF4B)
-
++ [Getting Started with USD in Maya 2023](https://help.autodesk.com/view/MAYAUL/2023/ENU/?guid=GUID-36CFE2C3-766F-4B00-8464-E94F95E7AF4B)
++ [Getting Started with USD in Maya 2024](https://help.autodesk.com/view/MAYAUL/2024/ENU/?guid=GUID-36CFE2C3-766F-4B00-8464-E94F95E7AF4B)
## Core Modules
+ [Common Plug-in Base Commands](lib/mayaUsd/commands/Readme.md)
diff --git a/doc/build.md b/doc/build.md
index e3b3428329..06a8879270 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -10,18 +10,18 @@ Before building the project, consult the following table to ensure you use the r
| Required |  |  |  |
|:---------------------:|:-------------------------:|:------------------------------------------------------------:|:---------------------------:|
-| Operating System | Windows 10 | High Sierra (10.13)
Mojave (10.14)
Catalina (10.15)
Big Sur (11.2.x) | CentOS 7/8 |
-| Compiler Requirement| Maya 2019 (VS 2017)
Maya 2020 (VS 2017)
Maya 2022 (VS 2017/2019)
Maya 2023 (VS 2019) | Maya 2019 (Xcode 7.3.1)
Maya 2020 (Xcode 10.2.1)
Maya 2022 (Xcode 10.2.1)
Maya 2023 (Xcode 10.2.1) | Maya 2019 (gcc 6.3.1)
Maya 2020 (gcc 6.3.1)
Maya 2022 (gcc 6.3.1/9.3.1)
Maya 2023 (gcc 9.3.1) |
+| Operating System | Windows 10 | High Sierra (10.13)
Mojave (10.14)
Catalina (10.15)
Big Sur (11.2.x)
Monterey (12.6) | CentOS 7/8
RHEL 8.6 |
+| Compiler Requirement| Maya 2019 (VS 2017)
Maya 2020 (VS 2017)
Maya 2022 (VS 2017/2019)
Maya 2023 (VS 2019)
Maya 2024 (VS 2022) | Maya 2019 (Xcode 7.3.1)
Maya 2020 (Xcode 10.2.1)
Maya 2022 (Xcode 10.2.1)
Maya 2023 (Xcode 10.2.1)
Maya 2024 (Xcode 13.4) | Maya 2019 (gcc 6.3.1)
Maya 2020 (gcc 6.3.1)
Maya 2022 (gcc 6.3.1/9.3.1)
Maya 2023 (gcc 9.3.1)
Maya 2024 (gcc 11.2.1) |
| CMake Version (min/max) | 3.13 - 3.17 | 3.13 - 3.17 | 3.13 - 3.17 |
| Python | 2.7.15 or 3.7.7 or 3.9.7 | 2.7.15 or 3.7.7 or 3.9.7 | 2.7.15 or 3.7.7 or 3.9.7 |
| Python Packages | PyYAML, PySide, PyOpenGL, Jinja2 | PyYAML, PySide2, PyOpenGL, Jinja2 | PyYAML, PySide, PyOpenGL, Jinja2 |
| Build generator | Visual Studio, Ninja (Recommended) | XCode, Ninja (Recommended) | Ninja (Recommended) |
| Command processor | Visual Studio X64 2017 or 2019 command prompt | bash | bash |
-| Supported Maya Version| 2019, 2020, 2022, 2023 | 2019, 2020, 2022, 2023 | 2019, 2020, 2022, 2023 |
+| Supported Maya Version| 2019, 2020, 2022, 2023, 2024 | 2019, 2020, 2022, 2023, 2024 | 2019, 2020, 2022, 2023, 2024 |
| Optional |  |  |  |
|:---------------------:|:-------------------------:|:------------------------------------------------------------:|:---------------------------:|
-| Qt | Maya 2019 = 5.6.1
Maya 2020 = 5.12.5
Maya 2022 = 5.15.2
Maya 2023 = 5.15.2 | Maya 2019 = 5.6.1
Maya 2020 = 5.12.5
Maya 2022 = 5.15.2
Maya 2023 = 5.15.2 | Maya 2019 = 5.6.1
Maya 2020 = 5.12.5
Maya 2022 = 5.15.2
Maya 2023 = 5.15.2 |
+| Qt | Maya 2019 = 5.6.1
Maya 2020 = 5.12.5
Maya 2022 = 5.15.2
Maya 2023 = 5.15.2
Maya 2024 = 5.15.2 | Maya 2019 = 5.6.1
Maya 2020 = 5.12.5
Maya 2022 = 5.15.2
Maya 2023 = 5.15.2
Maya 2024 = 5.15.2 | Maya 2019 = 5.6.1
Maya 2020 = 5.12.5
Maya 2022 = 5.15.2
Maya 2023 = 5.15.2
Maya 2024 = 5.15.2 |
***NOTE:*** Visit the online Maya developer help document under ***Setting up your build environment*** for additional compiler requirements on different platforms.
@@ -46,8 +46,9 @@ The Universal Front End (UFE) is a DCC-agnostic component that allows Maya to br
| v1.0.0 | Maya 2019.x | |
| v1.0.0 | Maya 2020.x | |
| v2.0.0
v2.0.3
v2.1.0 | Maya 2022
Maya 2022.1/2022.2/2022.3
Maya 2022.4 | https://help.autodesk.com/view/MAYAUL/2022/ENU/?guid=Maya_SDK_ufe_ref_index_html |
-| v3.0.0
v3.2.0 | Maya 2023/2023.1
Maya 2023.2 | https://help.autodesk.com/view/MAYAUL/2023/ENU/?guid=Maya_SDK_ufe_ref_index_html |
-| v0.4.x | Maya PR | |
+| v3.0.0
v3.2.0 | Maya 2023/2023.1
Maya 2023.2 | https://help.autodesk.com/view/MAYAUL/2023/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
+| v4.0.0 | Maya 2024 | https://help.autodesk.com/view/MAYAUL/2024/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
+| v0.5.x | Maya PR | |
To build the project with UFE support, you will need to use the headers and libraries included in the ***Maya Devkit***:
@@ -206,7 +207,7 @@ Test project /Users/sabrih/Desktop/workspace/build/Debug/plugin/al
It is important to use the Python version shipped with Maya and not the system version when building USD on MacOS. Note that this is primarily an issue on MacOS, where Maya's version of Python is likely to conflict with the version provided by the system.
-To build USD and the Maya plug-ins on MacOS for Maya (2019, 2020, 2022, 2023), run:
+To build USD and the Maya plug-ins on MacOS for Maya (2019, 2020, 2022, 2023, 2024), run:
```
/Applications/Autodesk/maya2019/Maya.app/Contents/bin/mayapy build_usd.py ~/Desktop/BUILD
```
From 781ee184c72b721bb7420c4841eaab22833b171d Mon Sep 17 00:00:00 2001
From: George Santos
Date: Fri, 31 Mar 2023 11:18:31 -0400
Subject: [PATCH 2/3] Update doc/build.md
---
doc/build.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/build.md b/doc/build.md
index 06a8879270..3b1e1efb1c 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -46,7 +46,7 @@ The Universal Front End (UFE) is a DCC-agnostic component that allows Maya to br
| v1.0.0 | Maya 2019.x | |
| v1.0.0 | Maya 2020.x | |
| v2.0.0
v2.0.3
v2.1.0 | Maya 2022
Maya 2022.1/2022.2/2022.3
Maya 2022.4 | https://help.autodesk.com/view/MAYAUL/2022/ENU/?guid=Maya_SDK_ufe_ref_index_html |
-| v3.0.0
v3.2.0 | Maya 2023/2023.1
Maya 2023.2 | https://help.autodesk.com/view/MAYAUL/2023/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
+| v3.0.0
v3.2.0 | Maya 2023/2023.1
Maya 2023.2/2023.3 | https://help.autodesk.com/view/MAYAUL/2023/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
| v4.0.0 | Maya 2024 | https://help.autodesk.com/view/MAYAUL/2024/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
| v0.5.x | Maya PR | |
From 886964b1754066ef22668b2a1f311d8e1f722767 Mon Sep 17 00:00:00 2001
From: Sean Donnelly <23455376+seando-adsk@users.noreply.github.com>
Date: Fri, 31 Mar 2023 12:07:07 -0400
Subject: [PATCH 3/3] Updated Ufe and Usd build info.
---
doc/build.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/build.md b/doc/build.md
index 3b1e1efb1c..9b600e23a3 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -31,7 +31,7 @@ See Pixar's official github page for instructions on how to build USD: https://g
| |  |
|:------------: |:---------------: |
-| CommitID/Tags | release: [v21.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.02) or [v21.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.05) or [v21.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.08) or [v21.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.11) or [v22.05b](https://github.com/PixarAnimationStudios/USD/releases/tag/v22.05b) or [v22.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v22.08)
dev: [48460d1 (tag v22.08)](https://github.com/PixarAnimationStudios/USD/commit/48460d145f8665f233234ae2f6e6f0e16914faa8) |
+| CommitID/Tags | release: [v21.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.02) or [v21.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.05) or [v21.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.08) or [v21.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.11) or [v22.05b](https://github.com/PixarAnimationStudios/USD/releases/tag/v22.05b) or [v22.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v22.08) or [v22.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v22.11)
dev: [97d2ba3 (tag v23.02)](https://github.com/PixarAnimationStudios/USD/commit/97d2ba37cc8749b147694d0dd5f9e7127e1b6919) |
For additional information on building Pixar USD, see the ***Additional Build Instruction*** section below.
@@ -46,7 +46,7 @@ The Universal Front End (UFE) is a DCC-agnostic component that allows Maya to br
| v1.0.0 | Maya 2019.x | |
| v1.0.0 | Maya 2020.x | |
| v2.0.0
v2.0.3
v2.1.0 | Maya 2022
Maya 2022.1/2022.2/2022.3
Maya 2022.4 | https://help.autodesk.com/view/MAYAUL/2022/ENU/?guid=Maya_SDK_ufe_ref_index_html |
-| v3.0.0
v3.2.0 | Maya 2023/2023.1
Maya 2023.2/2023.3 | https://help.autodesk.com/view/MAYAUL/2023/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
+| v3.0.0
v3.2.0
v3.3.0 | Maya 2023/2023.1
Maya 2023.2
Maya 2023.3 | https://help.autodesk.com/view/MAYAUL/2023/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
| v4.0.0 | Maya 2024 | https://help.autodesk.com/view/MAYAUL/2024/ENU/?guid=MAYA_API_REF_ufe_ref_index_html |
| v0.5.x | Maya PR | |