Commit graph

4887 commits

Author SHA1 Message Date
Ondrej Samohel
5a56df384d
set cpp project mode on demand 2020-03-02 12:25:15 +01:00
Ondrej Samohel
e0e182d6b5 Merge remote-tracking branch 'origin/develop' into feature/PYPE-617-UE-basic-integration 2020-03-01 21:29:33 +01:00
Milan Kolar
228c0ed190 bugfix: missing icons in maya shelf 2020-02-28 17:27:41 +01:00
Jakub Trllo
e0f0b48afc Merged in feature/PYPE-740_project_specific_plugins (pull request #518)
feature/PYPE-740 project specific plugins

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-28 14:34:16 +00:00
iLLiCiTiT
c765c02115 standalone publish allow project specific plugins 2020-02-28 15:27:57 +01:00
iLLiCiTiT
9ae412bff6 use subdict plugins for project specific plugins 2020-02-28 15:14:20 +01:00
Jakub Trllo
82ad531e78 Merged in bugfix/PYPE-737_extract_hier_archived_ents (pull request #514)
Bugfix/PYPE-737 extract hier archived ents

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-28 14:10:32 +00:00
iLLiCiTiT
8997da158a install project specific plugins (publish, load and create) found in {PYPE_PROJECT_PLUGINS}/{project_name} 2020-02-28 14:59:10 +01:00
Ondřej Samohel
e16a726acf Merged in feature/change-content-on-switch-context (pull request #511)
PYPE-532 switching context will now change content to new asset

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-28 13:54:59 +00:00
Jakub Ježek
f8c64a699d Merged in feature/PYPE-680-version-overwrite-validation (pull request #465)
Global Validation Versions

Approved-by: Jakub Ježek <jakub@pype.club>
Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-28 13:51:31 +00:00
Milan Kolar
c2da6a20ec making sure previous version cannot be overwritten 2020-02-28 14:51:06 +01:00
Jakub Jezek
71a3e111ef
feat(global): improving logic 2020-02-28 12:36:42 +01:00
Jakub Jezek
ab65bb1818
Merge branch 'develop' into feature/PYPE-680-version-overwrite-validation 2020-02-28 12:28:57 +01:00
iLLiCiTiT
350221e3e0 unarchivation override data and not update and return new entity 2020-02-28 12:26:48 +01:00
iLLiCiTiT
d8226f1d27 fixed variable name 2020-02-28 12:15:47 +01:00
iLLiCiTiT
172e661c6c Merge branch 'develop' into bugfix/PYPE-737_extract_hier_archived_ents 2020-02-28 12:06:10 +01:00
iLLiCiTiT
984f26a55d data are not overriden but only updated 2020-02-27 18:06:53 +01:00
iLLiCiTiT
a1275fedd5 set tasks, visualParent and inputs only for assets not for project 2020-02-27 18:06:35 +01:00
Jakub Trllo
f2bca6ad1b Merged in bugfix/create_streucture_for_managers (pull request #517)
bugfix/create structure for managers

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-27 16:56:43 +00:00
Jakub Trllo
e7283709d5 Merged in bugfix/top_hier_entities_deletion (pull request #516)
bugfix/top_hier_entities_deletion

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-27 16:55:57 +00:00
Jakub Trllo
d9afc17576 Merged in feature/better_burnin_error (pull request #515)
feature/better burnin error

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-27 16:55:07 +00:00
iLLiCiTiT
d5faf524b2 added project manager to allowed roles for create project structure 2020-02-27 17:15:42 +01:00
iLLiCiTiT
61ee78a1c8 fixed check of top hierarchy entities in sync to avalon 2020-02-27 16:46:44 +01:00
Jakub Trllo
f930e5cc09 Merged in feature/merge_upstream_021920 (pull request #512)
Feature/PYPE-747 merge upstream 021920

Approved-by: Jakub Ježek <jakub@pype.club>
Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-27 15:31:23 +00:00
Milan Kolar
3e87fb0dfe bugfix: farm rendering wasn't accepting project overrides 2020-02-27 16:24:24 +01:00
iLLiCiTiT
4bb9eef688 raise our TypeError when value for burnins is dictionary, list or tuple 2020-02-27 15:32:40 +01:00
Jakub Ježek
3256c1be9a Merged in bugfix/collect_handles_old_code (pull request #513)
fix(nks): old code were blocking processing

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-27 13:03:52 +00:00
iLLiCiTiT
904be8c666 fixed parents check 2020-02-27 11:23:05 +01:00
iLLiCiTiT
9f5f1403fc extract_hierarchy_avalon also checks for existence of archived_entities 2020-02-27 10:57:59 +01:00
Jakub Jezek
bf135e764d
Merge remote-tracking branch 'origin/bugfix/collect_handles_old_code' into feature/PYPE-680-version-overwrite-validation 2020-02-27 10:29:59 +01:00
Jakub Jezek
881ac734a2
Merge branch 'develop' into feature/PYPE-680-version-overwrite-validation 2020-02-27 10:25:57 +01:00
Jakub Jezek
ee7c691b61
fix(nks): old code were blocking processing 2020-02-27 10:09:32 +01:00
iLLiCiTiT
7df1f34ce9 set AVALON_HIERARCHY environment when application is launcher 2020-02-27 10:05:32 +01:00
iLLiCiTiT
923021b02f fixed action registering and missing QIcons 2020-02-27 09:55:12 +01:00
Ondřej Samohel
69ca74f27b
added info message on context change 2020-02-26 21:47:17 +01:00
Ondřej Samohel
856f67e113
added reset frame range on task change 2020-02-26 21:17:12 +01:00
Ondřej Samohel
3d52ae7fab Merge remote-tracking branch 'origin/develop' into feature/change-content-on-switch-context 2020-02-26 21:11:45 +01:00
iLLiCiTiT
fd3fcbd3ff nukestudio workio expect session by new avalon-core change 2020-02-26 18:50:33 +01:00
iLLiCiTiT
c005090874 nukestudio menu build was changed from actions list to hardcoded list with removed unused imports and removed library loader 2020-02-26 18:50:09 +01:00
Ondřej Samohel
911245caaa Merged in feature/PYPE-570-maya-renderlayer-creator (pull request #434)
PYPE-570: New farm render system

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-26 16:31:12 +00:00
Milan Kolar
0dc5c7a21d Merge branch 'develop' into feature/PYPE-570-maya-renderlayer-creator 2020-02-26 17:27:08 +01:00
Jakub Trllo
0066c50b59 Merged in draft/ffmpeg_with_multiple_paths (pull request #481)
draft/ffmpeg_with-multiple_paths

Approved-by: Ondřej Samohel <annatar@annatar.net>
Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-26 16:21:56 +00:00
Ondřej Samohel
09ef82cfd2
switching context will now change content to new asset 2020-02-26 16:05:33 +01:00
Milan Kolar
af11677b4e Merge branch 'feature/PYPE-570-maya-renderlayer-creator' of bitbucket.org:pypeclub/pype into feature/PYPE-570-maya-renderlayer-creator 2020-02-25 21:40:23 +01:00
Jakub Trllo
77f58380ee Merged in bugfix/collect_ftrack_api_bugfix (pull request #508)
bugfix/collect ftrack api bugfix
2020-02-24 15:52:19 +00:00
iLLiCiTiT
5db4d90e47 get project from list 2020-02-24 16:51:01 +01:00
iLLiCiTiT
b0a1b1a503 fix missing import after merge 2020-02-22 01:22:47 +01:00
iLLiCiTiT
1fd4861d6d Merge branch 'develop' into draft/ffmpeg_with_multiple_paths 2020-02-22 01:22:14 +01:00
Ondrej Samohel
6f8a860f00
rendering is done by default from published file 2020-02-22 01:19:32 +01:00
Ondřej Samohel
1bc88e3b1b Merged in feature/validate-ass-relative-paths (pull request #479)
validator for ass relative texture paths

Approved-by: Milan Kolar <milan@orbi.tools>
2020-02-21 23:28:37 +00:00