Commit graph

20246 commits

Author SHA1 Message Date
iLLiCiTiT
c2fd9b0148 added validate mark in/out to settings 2021-04-14 13:01:47 +02:00
iLLiCiTiT
42b772c5fb fixed validator name 2021-04-14 13:01:33 +02:00
iLLiCiTiT
722340e33e fix resolve of conflict 2021-04-14 12:54:00 +02:00
Toke Stuart Jepsen
bc401969ba Collect and use mark in/out frame and state.
# Conflicts:
#	pype/plugins/tvpaint/publish/collect_instances.py
2021-04-14 12:52:54 +02:00
Toke Stuart Jepsen
493e5cfa1d Remove frame range validation from project settings validator. 2021-04-14 12:52:17 +02:00
Toke Stuart Jepsen
0c08dcae73 Accurate frame information to user. 2021-04-14 12:52:08 +02:00
Toke Stuart Jepsen
05454f3cf2 Use static method instead of initializing class. 2021-04-14 12:51:58 +02:00
Toke Stuart Jepsen
a7a72d4f6f Validate mark in and out.
# Conflicts:
#	openpype/hosts/tvpaint/plugins/publish/validate_marks.py
2021-04-14 12:51:34 +02:00
Simone Barbieri
5e54d09ca1 Alembic loader is now more consistent with loaders for other formats 2021-04-14 11:37:36 +01:00
Ondřej Samohel
57e29726e9
updated creator 2021-04-14 12:21:40 +02:00
Ondřej Samohel
32a84740f7
update schemas 2021-04-14 12:19:33 +02:00
Simone Barbieri
b1b7eda2ac Implemented Alembic loader 2021-04-14 11:13:00 +01:00
Simone Barbieri
fa6c491d52 Fixed alembic extraction 2021-04-14 10:23:39 +01:00
iLLiCiTiT
95a82eeaf8 replaced OPENPYPE_ROOT with OPENPYPE_REPOS_ROOT in code 2021-04-14 11:15:55 +02:00
iLLiCiTiT
8d82fd8aa1 replaced OPENPYPE_ROOT with OPENPYPE_REPOS_ROOT in settings 2021-04-14 11:15:19 +02:00
iLLiCiTiT
42615bcb41 put subwidget into scroll area 2021-04-14 10:58:35 +02:00
iLLiCiTiT
25c5cf5642 previous widget was renamed to PypeInfoSubWidget 2021-04-14 10:57:14 +02:00
iLLiCiTiT
fafaf4c328 environment view ignore mouse wheel if does not have focus 2021-04-14 10:54:27 +02:00
Milan Kolar
a4143f5b1d
Merge pull request #1327 from pypeclub/bugfix/default_application_names
Fix default application names
2021-04-14 10:32:44 +02:00
Milan Kolar
d94f4eeebd
Merge pull request #1325 from pypeclub/feature/3.0_tvpaint_initial_project_settings
Set initial project settings
2021-04-14 10:32:15 +02:00
iLLiCiTiT
6df58f6153 fix conflict resolve changes 2021-04-14 10:31:41 +02:00
iLLiCiTiT
4eade6fc3c Merge branch 'develop' into feature/3.0_tvpaint_asset_name_validation 2021-04-14 10:31:29 +02:00
iLLiCiTiT
243092d05b fix default application names 2021-04-14 10:27:56 +02:00
Milan Kolar
0d5ae733b0 bump version 2021-04-14 00:08:48 +02:00
Milan Kolar
0e8c6319d6
Merge pull request #1322 from pypeclub/feature/settings_cleanup
Settings values cleanup
2021-04-13 19:07:32 +02:00
iLLiCiTiT
0ce878e7c2 changed logic of setting tvpaint data on start for Pype 3 2021-04-13 19:05:40 +02:00
Petr Kalis
5832e2bf61 Merge remote-tracking branch 'origin/develop' into feature/1294-sync-queue-gui-issues 2021-04-13 18:59:16 +02:00
iLLiCiTiT
6782062e53 make pair values explicit 2021-04-13 18:53:50 +02:00
iLLiCiTiT
6352219085 cleanup imports 2021-04-13 18:53:08 +02:00
iLLiCiTiT
e239c2bb0b added pre-set applications back to default 2021-04-13 18:49:32 +02:00
Milan Kolar
1d6abd9f8e
Merge pull request #1260 from pypeclub/feature/1121-site-sync-add-site-information-and-buttons-to-loader_op
Feature#1121 site sync add site information and buttons to loader
2021-04-13 18:46:26 +02:00
Milan Kolar
138ad21aba
Merge pull request #1321 from pypeclub/feature/prepare_project_prep
Prepare project Ftrack action in Pype 3
2021-04-13 18:43:48 +02:00
Toke Stuart Jepsen
189a18e88a Review fixes
- moved settings code to lib.
- checks for framerate, resolution and frame range.

# Conflicts:
#	pype/hosts/tvpaint/__init__.py
2021-04-13 18:39:24 +02:00
Toke Stuart Jepsen
0dd55198ee Set initial project settings.
# Conflicts:
#	pype/hooks/tvpaint/prelaunch.py
#	pype/hosts/tvpaint/__init__.py
2021-04-13 18:37:33 +02:00
Jakub Jezek
e376900d68
Hiero: hound fixes 2021-04-13 17:51:29 +02:00
Jakub Jezek
55854790a0
Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve 2021-04-13 17:41:24 +02:00
Jakub Jezek
1fef682dfc
Hiero: fixing review workflow 2021-04-13 16:58:22 +02:00
Milan Kolar
47f3f27996
Merge pull request #1301 from pypeclub/bugfix/1300-nuke-comp-renders-mix-up
Nuke: comp renders mix up
2021-04-13 16:51:25 +02:00
iLLiCiTiT
05b05f0039 changed clip out and frame end back to previous value 2021-04-13 16:18:21 +02:00
iLLiCiTiT
a7c0c70129 added preffered qt binding 2021-04-13 15:52:36 +02:00
iLLiCiTiT
47c8444d09 removed CREATE_NEW_CONSOLE from blender's default 2021-04-13 15:52:19 +02:00
iLLiCiTiT
97dc30e7b7 fix path to maya startup script 2021-04-13 15:42:00 +02:00
iLLiCiTiT
8b7f723b43 swap height and width resolution values 2021-04-13 15:41:17 +02:00
iLLiCiTiT
64585cc2f1 fix gamma ffmpeg argument 2021-04-13 15:40:52 +02:00
iLLiCiTiT
044139770e added default ftrack intent template 2021-04-13 15:35:36 +02:00
iLLiCiTiT
729af89972 removed applications from default settings 2021-04-13 15:35:10 +02:00
Jakub Jezek
87ad6fed45
Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve 2021-04-13 14:51:11 +02:00
iLLiCiTiT
d49a93a58a removed unused import 2021-04-13 14:38:19 +02:00
iLLiCiTiT
684dcb918d local version is not under OpenPype Admin group 2021-04-13 14:35:14 +02:00
iLLiCiTiT
03b2337bf4 added prepare project settings to server settings 2021-04-13 14:24:27 +02:00