Fix a compile bug in Traversals

.github/workflows/main.yml

@@ -9,7 +9,7 @@ on:
     branches: [ master ]
 
 env:
-  BUILD_TYPE: Release
+  BUILD_TYPE: RelWithDebInfo
 
 jobs:
 
@@ -18,7 +18,7 @@ jobs:
 #
 
   maya-win:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     strategy:
       # Without this, all containers stop if any fail
@@ -29,11 +29,11 @@ jobs:
       matrix:
        include:
           - maya: "2022"
-            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Windows.zip"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_5_Update_DEVKIT_Windows.zip"
           - maya: "2023"
-            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Windows.zip"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_3_Update_DEVKIT_Windows.zip"
           - maya: "2024"
-            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2024/Autodesk_Maya_2024_1_Update_DEVKIT_Windows.zip"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2024/Autodesk_Maya_2024_2_Update_DEVKIT_Windows.zip"
 
     steps:
       - name: Checkout code
@@ -69,66 +69,23 @@ jobs:
             artifacts/plug-ins/simplex_maya.mll
             artifacts/pyModules/py*simplex.pyd
 
-  maya-macos-11:
-    runs-on: macos-11
+  maya-macos:
+    runs-on: macos-latest
 
     strategy:
       fail-fast: false
 
       matrix:
        include:
           - maya: "2022"
-            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Mac.dmg"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_5_Update_DEVKIT_Mac.dmg"
+            arches: "x86_64"
           - maya: "2023"
-            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Mac.dmg"
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Install devkit
-        run: |
-          curl -o devkit.dmg ${{matrix.devkit}}
-          7z x devkit.dmg
-
-      - uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: '11.7'
-
-      - name: Configure CMake
-        run: |
-          cmake -G Xcode -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_BASE="$PWD/devkitBase"
-
-      - name: Build
-        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-      - name: Repath Artifacts
-        run: |
-          mkdir -p artifacts/plug-ins
-          mkdir -p artifacts/pyModules
-          cp ./build/src/maya/${{env.BUILD_TYPE}}/simplex_maya.bundle artifacts/plug-ins
-          cp ./build/src/python/${{env.BUILD_TYPE}}/py*simplex.so artifacts/pyModules
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: mac-${{matrix.maya}}
-          path: |
-            artifacts/plug-ins/simplex_maya.bundle
-            artifacts/pyModules/py*simplex.so
-
-  maya-macos-12:
-    runs-on: macos-12
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-       include:
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_3_Update_DEVKIT_Mac.dmg"
+            arches: "x86_64"
           - maya: "2024"
-            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2024/Autodesk_Maya_2024_1_Update_DEVKIT_Mac.dmg"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2024/Autodesk_Maya_2024_2_Update_DEVKIT_Mac.dmg"
+            arches: "x86_64;arm64"
 
     steps:
       - name: Checkout code
@@ -139,16 +96,15 @@ jobs:
       - name: Install devkit
         run: |
           curl -o devkit.dmg ${{matrix.devkit}}
-          MOUNTDIR=$(hdiutil mount devkit.dmg | awk 'END {$1=$2=""; print $0}')
-          cp -r $MOUNTDIR .
+          hdiutil attach devkit.dmg
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: '13.4'
 
       - name: Configure CMake
         run: |
-          cmake -G Xcode -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_BASE="$PWD/devkitBase"
+          cmake -G Xcode -DCMAKE_OSX_ARCHITECTURES="${{matrix.arches}}" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_BASE="/Volumes/devkitBase"
 
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
@@ -170,36 +126,39 @@ jobs:
 
   maya-linux:
     runs-on: ubuntu-latest
-    container: scottenglert/maya-build:${{matrix.maya}}
 
     strategy:
       fail-fast: false
 
       matrix:
        include:
+          - maya: "2022"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_5_Update_DEVKIT_Linux.tgz"
           - maya: "2023"
-            year: "2023"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_3_Update_DEVKIT_Linux.tgz"
           - maya: "2024"
-            year: "2024"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2024/Autodesk_Maya_2024_2_Update_DEVKIT_Linux.tgz"
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           submodules: true
 
-      - name: Install latest cmake
+      - name: Install OpenGL libraries
         run: |
-          python3 -m pip install cmake
+          sudo apt install libglu1-mesa-dev
 
-      - name: Configure CMake
+      - name: Install devkit
         run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_BASE="/usr/autodesk/devkitBase" ..
+          curl -o devkit.tgz ${{matrix.devkit}}
+          tar xvzf devkit.tgz
+
+      - name: Configure CMake
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION="${{matrix.maya}}" -DMAYA_DEVKIT_BASE="$PWD/devkitBase"
 
       - name: Build
-        run: cmake --build ./build --config ${{env.BUILD_TYPE}}
+        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
       - name: Repath Artifacts
         run: |
@@ -221,7 +180,7 @@ jobs:
 #
 
   python-win:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     strategy:
       fail-fast: false
@@ -258,7 +217,7 @@ jobs:
           path: dist/*.whl
 
   python-macos:
-    runs-on: macos-12
+    runs-on: macos-latest
 
     strategy:
       fail-fast: false
@@ -346,7 +305,7 @@ jobs:
 
   upload_release:
     name: Upload release
-    needs: [maya-win, maya-linux, maya-macos-11, maya-macos-12, python-win, python-macos, python-linux]
+    needs: [maya-win, maya-linux, maya-macos, python-win, python-macos, python-linux]
     runs-on: ubuntu-latest
 
     steps:

mayaConfigure.bat

@@ -1,6 +1,6 @@
 setlocal
 
-SET MAYA_VERSION=2022
+SET MAYA_VERSION=2023
 SET BUILD=mayabuild_%MAYA_VERSION%
 SET COMPILER=Visual Studio 17 2022
 

simplexui/falloffDialog.py

@@ -366,7 +366,7 @@ def loadSimplex(self):
 
         print("Adding Mappings")
         currentIndex = "currentIndex"
-        if six.PY3 and QtLib.IsPySide2:
+        if six.PY3 and (QtLib.IsPySide2 or QtLib.IsPyQt5):
             currentIndex = QByteArray(bytes("Test", encoding="utf-8"))
 
         self._falloffMapper.addMapping(self.uiFalloffTypeCBOX, 1, currentIndex)

simplexui/menu/genericPlugins/_builtins.py

@@ -198,6 +198,11 @@ def registerComboTree(window, clickIdx, indexes, menu):
         setValsACT = menu.addAction("Set Selected Values")
         setValsACT.triggered.connect(self.setSliderVals)
 
+        setGroupMenu = menu.addMenu("Set Group")
+        for group in window.simplex.comboGroups:
+            gAct = setGroupMenu.addAction(group.name)
+            gAct.triggered.connect(partial(self.setSelectedComboGroups, group))
+
         menu.addSeparator()
 
         setSolveMenu = menu.addMenu("Set Solve Type")

simplexui/menu/genericPlugins/exportSplit.py

@@ -54,6 +54,6 @@ def exportSplitInterface(window):
         split = window.simplex.split(pBar)
         split.exportAbc(path, pBar)
     except ValueError as e:
-        QMessageBox.warning(window, "Unsplittable", e.message)
+        QMessageBox.warning(window, "Unsplittable", str(e))
     finally:
         pBar.close()

simplexui/simplexDialog.py

@@ -1292,6 +1292,20 @@ def setSelectedSliderInterp(self, interp):
             s.prog.interp = interp
 
     # Combo Settings
+    def setSelectedComboGroups(self, group):
+        """ Set the group for the selected Combos
+
+        Parameters
+        ----------
+        group : Group
+            The group that will take the selected Combos
+        """
+        if not group:
+            return
+        combos = self.uiComboTREE.getSelectedItems(Combo)
+        group.take(combos)
+        self.uiComboTREE.viewport().update()
+
     def setSelectedComboSolveType(self, stVal):
         """ Set the solve type for the selected combos
 

src/lib/traversal.cpp

@@ -32,6 +32,7 @@ Traversal::Traversal(
 		ShapeController* progressCtrl, ShapeController* multiplierCtrl, bool valueFlip, bool multiplierFlip):
 		ShapeController(name, prog, index), exact(true){
 
+	solveType = ComboSolve::None;
 	if (multiplierCtrl->sliderType()) {
 		multState.push_back(std::make_pair((Slider*)multiplierCtrl, multiplierFlip ? -1.0 : 1.0));
 	}
@@ -65,6 +66,8 @@ Traversal::Traversal(
 	std::unordered_map<Slider*, double> startSliders, endSliders;
 	std::unordered_set<Slider*> allSliders;
 
+	this->solveType = solveType;
+
 	for (size_t i=0; i<startPairs.size(); ++i){
 		startSliders[startPairs[i].first] = startPairs[i].second;
 		allSliders.insert(startPairs[i].first);