Merge branch 'mGear5' into master

mgear-dev · Nov 29, 2024 · 5f4a198 · 5f4a198
2 parents e955578 + e4d3d53
commit 5f4a198
Show file tree

Hide file tree

Showing 259 changed files with 5,113 additions and 6,414 deletions.
diff --git a/anim_picker_samples/biped.pkr b/anim_picker_samples/biped.pkr
@@ -5729,7 +5729,7 @@
                         "text_size": 10.0
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)",
                         "color": [
                             255, 
                             116, 
@@ -5769,7 +5769,7 @@
                         "text_size": 14.0
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)",
                         "color": [
                             85, 
                             170, 

diff --git a/anim_picker_samples/biped_simple.pkr b/anim_picker_samples/biped_simple.pkr
@@ -4775,7 +4775,7 @@
                         ]
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)",
                         "color": [
                             255, 
                             116, 
@@ -4815,7 +4815,7 @@
                         "text_size": 14.0
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)",
                         "color": [
                             85, 
                             170, 

diff --git a/release/mGear.mod b/release/mGear.mod
@@ -70,3 +70,15 @@ icons: ../../../../icons
 scripts: ../../../../scripts
 icons: ../../../../icons
 
++ MAYAVERSION:2025 PLATFORM:win64 mGear 4.0 ./platforms/2025/windows/x64
+scripts: ../../../../scripts
+icons: ../../../../icons
+
++ MAYAVERSION:2025 PLATFORM:linux mGear 4.0 ./platforms/2025/linux/x64
+scripts: ../../../../scripts
+icons: ../../../../icons
+
++ MAYAVERSION:2025 PLATFORM:mac   mGear 4.0 ./platforms/2025/osx/x64
+scripts: ../../../../scripts
+icons: ../../../../icons
+
diff --git a/release/platforms/2025/osx/x64/plug-ins/mgear_solvers.bundle b/release/platforms/2025/osx/x64/plug-ins/mgear_solvers.bundle
diff --git a/release/platforms/2025/windows/x64/plug-ins/mgear_solvers.mll b/release/platforms/2025/windows/x64/plug-ins/mgear_solvers.mll
diff --git a/release/scripts/mgear/__init__.py b/release/scripts/mgear/__init__.py
@@ -25,7 +25,7 @@
 sev_comment = 32
 
 # gear version
-VERSION = [4, 2, 10]
+VERSION = [5, 0, 0]
 
 self = sys.modules[__name__]
 self.menu_id = None

diff --git a/release/scripts/mgear/anim_picker/gui.py b/release/scripts/mgear/anim_picker/gui.py
@@ -11,7 +11,7 @@
 
 # dcc
 from maya import cmds
-import pymel.core as pm
+import mgear.pymaya as pm
 
 from maya.app.general.mayaMixin import MayaQWidgetDockableMixin
 
@@ -24,7 +24,7 @@
 
 from mgear.vendor.Qt import QtGui
 from mgear.vendor.Qt import QtCore
-from mgear.vendor.Qt import QtOpenGL
+# from mgear.vendor.Qt import QtOpenGL
 from mgear.vendor.Qt import QtCompat
 from mgear.vendor.Qt import QtWidgets
 
@@ -44,7 +44,7 @@
 
 from .handlers import __EDIT_MODE__
 from .handlers import __SELECTION__
-from six.moves import range
+from mgear.core.six.moves import range
 
 # constants -------------------------------------------------------------------
 try:
@@ -344,14 +344,14 @@ def __init__(self,
         self.scale(1, -1)
 
         # Open GL render, to check...
-        if basic.__USE_OPENGL__:
-            # make that view use OpenGL
-            gl_format = QtOpenGL.QGLFormat()
-            gl_format.setSampleBuffers(True)
-            gl_widget = QtOpenGL.QGLWidget(gl_format)
-
-            # use the GL widget for viewing
-            self.setViewport(gl_widget)
+        # if basic.__USE_OPENGL__:
+        #     # make that view use OpenGL
+        #     gl_format = QtOpenGL.QGLFormat()
+        #     gl_format.setSampleBuffers(True)
+        #     gl_widget = QtOpenGL.QGLWidget(gl_format)
+
+        #     # use the GL widget for viewing
+        #     self.setViewport(gl_widget)
 
         self.setResizeAnchor(self.AnchorViewCenter)
 

diff --git a/release/scripts/mgear/anim_picker/menu.py b/release/scripts/mgear/anim_picker/menu.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 
 from maya import cmds
-import pymel.core as pm
+import mgear.pymaya as pm
 
 import mgear
 import mgear.menu

diff --git a/release/scripts/mgear/anim_picker/picker_node.py b/release/scripts/mgear/anim_picker/picker_node.py
@@ -9,7 +9,7 @@
 
 # dcc
 from maya import cmds
-import pymel.core as pm
+import mgear.pymaya as pm
 
 # anim picker
 import mgear.anim_picker

diff --git a/release/scripts/mgear/anim_picker/picker_templates/biped.pkr b/release/scripts/mgear/anim_picker/picker_templates/biped.pkr
@@ -5729,7 +5729,7 @@
                         "text_size": 10.0
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)",
                         "color": [
                             255, 
                             116, 
@@ -5769,7 +5769,7 @@
                         "text_size": 14.0
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)",
                         "color": [
                             85, 
                             170, 

diff --git a/release/scripts/mgear/anim_picker/picker_templates/biped_simple.pkr b/release/scripts/mgear/anim_picker/picker_templates/biped_simple.pkr
@@ -4775,7 +4775,7 @@
                         ]
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.select(members, r=True)",
                         "color": [
                             255, 
                             116, 
@@ -4815,7 +4815,7 @@
                         "text_size": 14.0
                     }, 
                     {
-                        "action_script": "import pymel.core as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)", 
+                        "action_script": "import mgear.pymaya as pm\nif not __INIT__:\n    grp = \"rig_controllers_grp\"\n    if __NAMESPACE__:\n        grp = __NAMESPACE__ + \":\" + grp\n\n    members = pm.PyNode(grp).members()\n    pm.setKeyframe(members)",
                         "color": [
                             85, 
                             170, 

diff --git a/release/scripts/mgear/anim_picker/widgets/basic.py b/release/scripts/mgear/anim_picker/widgets/basic.py
@@ -9,7 +9,7 @@
 
 # dcc
 import maya.cmds as cmds
-from pymel import versions
+from mgear.pymaya import versions
 
 # mgear
 from mgear.vendor.Qt import QtGui

diff --git a/release/scripts/mgear/anim_picker/widgets/picker_widgets.py b/release/scripts/mgear/anim_picker/widgets/picker_widgets.py
@@ -29,7 +29,7 @@
                                         __SELECTION__,
                                         python_handlers,
                                         maya_handlers)
-from six.moves import range
+from mgear.core.six.moves import range
 
 # constants -------------------------------------------------------------------
 SCRIPT_DOC_HEADER = \

diff --git a/release/scripts/mgear/animbits/cache_manager/collapse_widget.py b/release/scripts/mgear/animbits/cache_manager/collapse_widget.py
@@ -1,7 +1,7 @@
 
 # imports
-from PySide2 import QtCore, QtWidgets
-
+from mgear.vendor.Qt import QtCore
+from mgear.vendor.Qt import QtWidgets
 
 class QCollapse(QtWidgets.QWidget):
 
@@ -65,10 +65,10 @@ def __run_animation(self):
         # set arrow and animation direction state
         if self.arrow_button.isChecked():
             self.arrow_button.setArrowType(QtCore.Qt.DownArrow)
-            self.animation_group.setDirection(self.animation_group.Forward)
+            self.animation_group.setDirection(QtCore.QAbstractAnimation.Forward)
         else:
             self.arrow_button.setArrowType(QtCore.Qt.RightArrow)
-            self.animation_group.setDirection(self.animation_group.Backward)
+            self.animation_group.setDirection(QtCore.QAbstractAnimation.Backward)
 
         # starts animation
         self.animation_group.start()

diff --git a/release/scripts/mgear/animbits/cache_manager/dialog.py b/release/scripts/mgear/animbits/cache_manager/dialog.py
@@ -1,9 +1,9 @@
 
 # imports
 from __future__ import absolute_import
-from PySide2 import QtCore
-from PySide2 import QtGui
-from PySide2 import QtWidgets
+from mgear.vendor.Qt import QtCore
+from mgear.vendor.Qt import QtWidgets
+from mgear.vendor.Qt import QtGui
 from maya.app.general.mayaMixin import MayaQWidgetDockableMixin
 
 # tool imports
@@ -60,7 +60,7 @@ def __init__(self, parent=None):
 
         # creates main layout widget
         self.main_layout = QtWidgets.QVBoxLayout(self)
-        self.main_layout.setMargin(6)
+        self.main_layout.setContentsMargins(6, 6, 6, 6)
         self.main_layout.setSpacing(6)
 
         # colors to use
@@ -109,7 +109,7 @@ def _create_widgets(self):
         self.main_layout.addWidget(options_widget)
 
         frame_layout = QtWidgets.QGridLayout()
-        frame_layout.setMargin(4)
+        frame_layout.setContentsMargins(4, 4, 4, 4)
         frame_layout.setSpacing(4)
 
         label = QtWidgets.QLabel("Options:")
@@ -145,7 +145,7 @@ def _create_widgets(self):
 
         display_frame = QtWidgets.QFrame()
         display_layout = QtWidgets.QGridLayout(display_frame)
-        display_layout.setMargin(0)
+        display_layout.setContentsMargins(0, 0, 0, 0)
         gpu_display_label = QtWidgets.QLabel("Display type:")
         self.keep_display_radial = QtWidgets.QRadioButton("Current")
         self.keep_display_radial.setObjectName(
@@ -185,7 +185,7 @@ def _create_widgets(self):
 
         # create layout for frame
         frame_layout = QtWidgets.QGridLayout(frame)
-        frame_layout.setMargin(4)
+        frame_layout.setContentsMargins(4, 4, 4, 4)
         frame_layout.setSpacing(4)
 
         # creates search line edit
@@ -202,8 +202,8 @@ def _create_widgets(self):
         self.rigs_list_view.setObjectName("cache_manager_rigs_qlistview")
         self.rigs_list_view.setAlternatingRowColors(True)
         self.rigs_list_view.setSelectionMode(
-            self.rigs_list_view.ExtendedSelection)
-        self.rigs_list_view.setEditTriggers(self.rigs_list_view.NoEditTriggers)
+            QtWidgets.QAbstractItemView.ExtendedSelection)
+        self.rigs_list_view.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
 
         # adds widgets to frame layout
         frame_layout.addWidget(label, 0, 0, 1, 1)
@@ -217,7 +217,7 @@ def _create_widgets(self):
 
         # create layout for frame
         frame_layout = QtWidgets.QGridLayout(frame)
-        frame_layout.setMargin(4)
+        frame_layout.setContentsMargins(4, 4, 4, 4)
         frame_layout.setSpacing(4)
 
         # creates cache button
@@ -299,15 +299,17 @@ def _set_display_color(self):
         self.color_button.setPalette(palette)
 
     def _show_browser(self):
-        """ Opens the file browser dialog
+        """Opens the file browser dialog
 
-        This file browser is used in order to pick where the caching files
-        are going to be stored
+        This file browser is used to pick where the caching files
+        are going to be stored.
         """
 
-        brower = QtWidgets.QFileDialog(self)
-        brower.setFileMode(brower.DirectoryOnly)
-        return brower.getExistingDirectory()
+        # Create a QFileDialog instance for directory selection
+        directory = QtWidgets.QFileDialog.getExistingDirectory(
+            self, "Select Directory", "", QtWidgets.QFileDialog.ShowDirsOnly
+        )
+        return directory
 
     def dockCloseEventTriggered(self, *args, **kwargs):  # @unusedVariables
         """ Overwrites MayaQWidgetDockableMixin method

diff --git a/release/scripts/mgear/animbits/cache_manager/mayautils.py b/release/scripts/mgear/animbits/cache_manager/mayautils.py
@@ -7,8 +7,8 @@
 from contextlib import contextmanager
 from maya import cmds, mel, OpenMayaUI
 from maya.app.renderSetup.model import renderSetup, renderLayer, typeIDs
-from PySide2 import QtWidgets
-from shiboken2 import wrapInstance
+from mgear.vendor.Qt import QtWidgets
+from mgear.vendor.Qt import QtCompat
 from mgear.animbits.cache_manager.query import (
     _MANAGER_PREFERENCE_PATH,
     get_preference_file,
@@ -214,7 +214,7 @@ def kill_ui(name):
         return
 
     # wraps the widget into a qt object
-    qt_object = wrapInstance(long(widget), QtWidgets.QDialog)
+    qt_object = QtCompat.wrapInstance(long(widget), QtWidgets.QDialog)
 
     # sets the widget parent to none
     qt_object.setParent(None)

diff --git a/release/scripts/mgear/animbits/cache_manager/model.py b/release/scripts/mgear/animbits/cache_manager/model.py
@@ -1,8 +1,8 @@
 
 # imports
 import os
-from PySide2 import QtCore
-from PySide2 import QtGui
+from mgear.vendor.Qt import QtCore
+from mgear.vendor.Qt import QtGui
 from mgear.animbits.cache_manager.query import is_rig
 
 

diff --git a/release/scripts/mgear/animbits/channel_master.py b/release/scripts/mgear/animbits/channel_master.py
@@ -1,5 +1,5 @@
 import maya.cmds as cmds
-import pymel.core as pm
+import mgear.pymaya as pm
 from mgear.core import pyqt
 from mgear.core import attribute
 from mgear.core import utils

diff --git a/release/scripts/mgear/animbits/channel_master_node.py b/release/scripts/mgear/animbits/channel_master_node.py
@@ -1,7 +1,7 @@
 import json
 import ast
 from maya import cmds
-import pymel.core as pm
+import mgear.pymaya as pm
 
 from mgear.core import attribute
 from mgear.core import string

diff --git a/release/scripts/mgear/animbits/channel_master_utils.py b/release/scripts/mgear/animbits/channel_master_utils.py
@@ -1,5 +1,5 @@
 import maya.cmds as cmds
-import pymel.core as pm
+import mgear.pymaya as pm
 
 from mgear.core import attribute
 

diff --git a/release/scripts/mgear/animbits/channel_master_widgets.py b/release/scripts/mgear/animbits/channel_master_widgets.py
@@ -1,5 +1,5 @@
 import maya.cmds as cmds
-import pymel.core as pm
+import mgear.pymaya as pm
 from mgear.core import pyflow_widgets
 from mgear.core import widgets as mwgt
 from mgear.core import pyqt