Commit graph

9437 commits

Author SHA1 Message Date
Ondrej Samohel
32ee682168
move scripts to tools, make them path independent, clean build dir 2020-12-21 19:46:30 +01:00
Milan Kolar
3ec08dd6e9
Merge pull request #845 from pypeclub/feature/ftrack_events_without_presets_pass
Ftrack events are not expecting presets argument
2020-12-21 13:14:06 +01:00
iLLiCiTiT
70034aee60 plugins_presets was removed as is not used anymore 2020-12-21 11:10:06 +01:00
Milan Kolar
0db15c183e Merge branch '2.x/develop' into develop 2020-12-21 09:23:36 +01:00
Milan Kolar
a3f68c99d6 Merge branch 'master' into 2.x/develop 2020-12-21 09:23:29 +01:00
Milan Kolar
33f96cd010 Merge remote-tracking branch 'origin/2.x/develop' into develop 2020-12-21 09:21:47 +01:00
Milan Kolar
a4b2556538
Merge pull request #840 from tokejepsen/2.x/feature/maya_playblast_image_plane
Optionally hide image planes from reviews.
2020-12-21 09:16:35 +01:00
Milan Kolar
1a6f6bfd92
Merge pull request #832 from pypeclub/bugfix/pype_py_import
Pype.py do not boot on import
2020-12-18 21:17:58 +01:00
Milan Kolar
ed54150b33
Merge pull request #844 from pypeclub/feature/list_item_with_wrapper
List item with wrapper
2020-12-18 20:47:34 +01:00
iLLiCiTiT
e0da4dd9f7 add use_label_wrap to ftrack's parent_status_by_task_status key 2020-12-18 19:56:25 +01:00
iLLiCiTiT
9b5c6a0062 added readme info about use_label_wrap 2020-12-18 19:54:38 +01:00
iLLiCiTiT
3c23598b3e raw json does not need to fill label 2020-12-18 19:48:24 +01:00
iLLiCiTiT
d90991fd39 empty labels are removed 2020-12-18 19:48:08 +01:00
iLLiCiTiT
9a6b710b74 added label to Roots 2020-12-18 19:44:13 +01:00
iLLiCiTiT
fc6426ef63 key last_workfile_on_startup has use_label_wrap now instead of collapsible-wrap as parent item 2020-12-18 19:44:04 +01:00
iLLiCiTiT
f068a86337 update_style works with label wrapper in list item 2020-12-18 19:42:53 +01:00
iLLiCiTiT
e05ef9b431 create_ui in list item wraps item with collapsible label 2020-12-18 19:42:33 +01:00
iLLiCiTiT
c32a9766f7 remove backwards compatibility 2020-12-18 19:41:57 +01:00
iLLiCiTiT
3564be679b added use_label_wrap attribute to list item 2020-12-18 19:41:26 +01:00
iLLiCiTiT
d0b827ccbb added label check on is_group item 2020-12-18 19:41:04 +01:00
Milan Kolar
fb81f4166f
Merge pull request #841 from pypeclub/feature/task_to_parent_with_settings
Task to parent with settings
2020-12-18 19:18:16 +01:00
iLLiCiTiT
22d783282e fix entity type mapping 2020-12-18 19:13:46 +01:00
Milan Kolar
ac32653827
Merge pull request #833 from pypeclub/feature/task_to_version_use_setings
Task to version use settings
2020-12-18 18:57:50 +01:00
Milan Kolar
d615c07729 change defaults for ftrack attributes 2020-12-18 18:57:17 +01:00
iLLiCiTiT
8ffbe212f3 single task status match fixes 2020-12-18 18:38:40 +01:00
Milan Kolar
5fa62d6d83
Merge pull request #835 from pypeclub/feature/tray_without_subprocess
Tray without subprocess
2020-12-18 18:29:09 +01:00
Milan Kolar
264e32158b
Merge pull request #843 from pypeclub/feature/settings_tool_without_subprocess
Settings tool without subprocess
2020-12-18 18:29:02 +01:00
Milan Kolar
0b556f8719
Merge pull request #839 from pypeclub/bugfix/terminal_crash_on_import
terminal.py crash on import
2020-12-18 17:15:01 +01:00
iLLiCiTiT
1f59c6be82 trigger settings.main in pype commands instead of creating new subprocess 2020-12-18 17:10:33 +01:00
iLLiCiTiT
8706f01197 main function of settings gui moved to __init__.py 2020-12-18 17:09:43 +01:00
iLLiCiTiT
21b2f3e018 single_match as list fix 2020-12-18 16:52:13 +01:00
Milan Kolar
a8ca9ff41d
Merge pull request #837 from pypeclub/fix/AE-frames-int
Fix - AE - added explicit cast to int
2020-12-18 16:51:35 +01:00
iLLiCiTiT
6b7933895f reimplemented best order status 2020-12-18 16:45:37 +01:00
iLLiCiTiT
2e6b372906 parent_status_by_task_status is list of dictionaries 2020-12-18 16:45:07 +01:00
iLLiCiTiT
ab97f5df3c minor fixes 2020-12-18 16:03:57 +01:00
iLLiCiTiT
cfcb9f49bd removed unused methods 2020-12-18 16:03:47 +01:00
Toke Stuart Jepsen
637fba0357 Optionally hide image planes from reviews. 2020-12-18 14:54:16 +00:00
iLLiCiTiT
d012f54a1f set _initialized to True on _initialize call 2020-12-18 15:43:00 +01:00
iLLiCiTiT
0e4eb39c6c added initialization part to Terminal class 2020-12-18 15:34:34 +01:00
iLLiCiTiT
3031224736 task to parent status are converted to use settings 2020-12-18 15:33:26 +01:00
iLLiCiTiT
50d2d9db71 get rid of register override and class attributes 2020-12-18 15:32:30 +01:00
Petr Kalis
a8e83d350a Fix - AE - added explicit cast to int
Deadline requires integers only in frames range.
On some environments rounded floats are pushed in, this casts them to int explicitly.
2020-12-18 12:56:54 +01:00
iLLiCiTiT
c644453b76 added object type filtering to settings 2020-12-18 12:52:27 +01:00
Milan Kolar
be9c4d4841 Revert "Merge remote-tracking branch 'origin/2.x/develop' into develop"
This reverts commit b38585243c.
2020-12-18 12:49:28 +01:00
Milan Kolar
b38585243c Merge remote-tracking branch 'origin/2.x/develop' into develop 2020-12-18 12:47:32 +01:00
iLLiCiTiT
31e879af08 added comment 2020-12-18 10:51:15 +01:00
iLLiCiTiT
c0e6d24ed5 less invasive way of not using root logger 2020-12-18 10:49:32 +01:00
iLLiCiTiT
cc6c752533 remove handlers from root logger to avoid doubled logs 2020-12-18 10:36:24 +01:00
iLLiCiTiT
2130fa4995 launch_tray in pype_commands just import tray and run it's main 2020-12-18 10:35:36 +01:00
iLLiCiTiT
07ef600cfc tray main function moved to pype_tray.py and imported in tray's __init__.py 2020-12-18 10:34:40 +01:00