update studiolibrary and fix dwpicker conflict

scottdmilner · Nov 21, 2024 · 0084475 · 0084475
1 parent e1ed0e7
commit 0084475
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pipeline/software/maya/scripts/dwpicker_git b/pipeline/software/maya/scripts/dwpicker_git
diff --git a/pipeline/software/maya/scripts/studiolibrary b/pipeline/software/maya/scripts/studiolibrary
+0 −6		dwpicker/__init__.py
+1 −1		dwpicker/align.py
+1 −1		dwpicker/colorwheel.py
+1 −1		dwpicker/commands.py
+1 −1		dwpicker/designer/attributes.py
+1 −1		dwpicker/designer/editarea.py
+7 −7		dwpicker/designer/editor.py
+1 −1		dwpicker/designer/highlighter.py
+1 −1		dwpicker/designer/layer.py
+29 −29		dwpicker/designer/menu.py
+1 −1		dwpicker/dialog.py
+1 −1		dwpicker/geometry.py
+1 −1		dwpicker/hotkeyseditor.py
+1 −1		dwpicker/ingest/animschool/converter.py
+1 −1		dwpicker/interactive.py
+20 −20		dwpicker/main.py
+1 −1		dwpicker/painting.py
+8 −8		dwpicker/picker.py
+1 −1		dwpicker/preference.py
+0 −14		dwpicker/qt_remapping/PySide2.py
+0 −1		dwpicker/qt_remapping/shiboken2.py
+4 −4		dwpicker/qtutils.py
+1 −1		dwpicker/quick.py
+1 −1		dwpicker/widgets.py
+1 −1		scripts/independent_picker_widget.py
+1 −1		src/studiolibrary/__init__.py
+3 −0		src/studiolibrary/folderitem.py
+28 −0		src/studiolibrary/library.py
+11 −1		src/studiolibrary/libraryitem.py
+10 −8		src/studiolibrary/utils.py
+1 −1		src/studiolibrary/widgets/itemswidget/treewidget.py
+4 −4		src/studiovendor/Qt.py