Commit graph

64 commits

Author SHA1 Message Date
Milan Kolar
bf7d25fd94 cleanup conflicts 2019-02-17 21:26:29 +01:00
Milan Kolar
d58778e925 Merge branch 'develop' into feature/PYPE-99_unified_template_fill
# Conflicts:
#	pype/lib.py
#	pype/plugins/global/publish/integrate_rendered_frames.py
2019-02-17 21:25:27 +01:00
Milan Kolar
36e3ab4829 fix environment cleanup when sending to farm 2019-02-14 08:54:22 +01:00
Milan Kolar
690cc3ffe0 renderr submission fixe on avalon_deadline 2019-02-12 17:44:09 +01:00
Jakub Trllo
a620acac87 Merged in feature/PYPE-184_format_path_silotasks (pull request #63)
hierarchy is set to empty string if no parents

Approved-by: Milan Kolar <milan@orbi.tools>
2019-02-11 22:09:03 +00:00
Milan Kolar
4462972d52 fixing review collection and minor tweaks 2019-02-10 00:12:48 +01:00
Milan Kolar
30f8048b89 Merge branch 'develop' into bugfix/PYPE-160-mov-generation 2019-02-08 17:48:09 +01:00
Jakub Trllo
a8745ed130 VERSION removed and replaced by version 2019-02-07 15:34:55 +01:00
Milan Kolar
8d28c4af44 fix version checker, and other nuke fixes 2019-02-06 21:18:56 +01:00
Jakub Trllo
f43b1d8cde hierarchy is set to empty string if no parents 2019-02-06 19:59:00 +01:00
Jakub Trllo
e0de3a1447 project and projectcode changed to project dict 2019-02-06 19:46:39 +01:00
antirotor
64f39193f5
add ffmpeg validator, error handling 2019-02-05 17:01:15 +01:00
Milan Kolar
da61d285da Merge branch 'develop' into bugfix/PYPE-147-fixing-nuke-publishing-write
# Conflicts:
#	pype/plugins/global/publish/integrate_rendered_frames.py
2019-01-30 23:23:12 +01:00
Milan Kolar
77f02101f6 cleanup conflicts with CB code 2019-01-28 22:59:57 +01:00
Milan Kolar
ca57d2cd87 colorbleed to pype reformat 2019-01-28 21:27:58 +01:00
Milan Kolar
c8ba94ccbf rename cb to pype 2019-01-28 20:31:55 +01:00
Jakub Jezek
ae30f7ceb4 Merge branch 'develop' into feature/PYPE-92-pr-basic-pipeline-linking 2019-01-28 13:33:42 +01:00
Jakub Jezek
357e1afe6f fix ing family targets 2019-01-28 13:24:17 +01:00
Milan Kolar
e5efe62a81 fixing families in loader 2019-01-21 13:44:24 +01:00
Milan Kolar
e1601664f1 json extraction is causing troubles in nuke. temporarily setting to just maya host 2019-01-18 17:58:39 +01:00
Milan Kolar
e521eaacce Merge branch 'develop' into bugfix/PYPE-147-fixing-nuke-publishing-write 2019-01-17 20:01:17 +01:00
Milan Kolar
c091bec375 Merge branch 'develop' into feature/PYPE-83_validate_script
# Conflicts:
#	pype/plugins/global/publish/integrate_rendered_frames.py
2019-01-16 19:39:00 +01:00
Jakub Jezek
95c9c2bc9b aport collect intances update, filter out "clip" family from global plugins, fix extract_post_json, adding some supporting functions to pype.lib and templates and api 2019-01-14 18:33:10 +01:00
Jakub Jezek
0a844ee709 cosmetic changes 2019-01-12 18:27:28 +01:00
Jakub Jezek
3fd9170e1f adding json export of all context and instances for debug, polishing integrate_render_frames 2019-01-12 18:27:06 +01:00
Milan Kolar
e25c840a29 add option to work with arnold standins and simple proxies 2019-01-09 19:39:38 +01:00
Milan Kolar
15c3911296 hotfix / filter integrate rendered frames 2019-01-08 11:32:44 +01:00
Milan Kolar
3a583a04d1 Merge branch 'develop' into feature/PYPE-61-publish-nuke-script-version 2019-01-07 15:49:17 +01:00
Milan Kolar
78c5b506ee move rendered frames integrator to global 2018-12-18 22:02:38 +01:00
Milan Kolar
237d26f258 fix image sequence collection 2018-12-18 22:01:57 +01:00
Milan Kolar
2a53aefcc6 fix clique import 2018-12-18 18:52:20 +01:00
Jakub Jezek
c608e1335f implemented review [mov, thumbnail], upversioning script sinchronized with publishing write 2018-12-18 12:59:49 +01:00
Milan Kolar
a2a2fba4ec add all PYPE environments to deadline env 2018-12-17 20:24:47 +01:00
Milan Kolar
e4f5ec1a8c adding published maya scene for rendering 2018-12-17 16:49:57 +01:00
Jakub Jezek
440d479a8e Merge branch 'develop' into feature/PYPE-61-publish-nuke-script-version 2018-12-17 09:52:58 +01:00
Milan Kolar
fdf4642d32 update plugins to use our templates 2018-12-14 16:05:43 +01:00
Jakub Jezek
c2af511e06 update publishing script with write render 2018-12-13 14:59:43 +01:00
Jakub Jezek
838ecf94ca Merge branch 'develop' into feature/PYPE-61-publish-nuke-script-version 2018-12-11 23:26:42 +01:00
Jakub Jezek
958aeab2e6 wip improving publishing version 2018-12-11 18:01:47 +01:00
Milan Kolar
dee6f9a7a7 add ffmpeg-python, and publish quicktime to ftrack 2018-12-07 17:38:16 +01:00
Milan Kolar
bdbd1a7189 Merge branch 'develop' into feature/PYPE-18-maya-publishing-playblasts 2018-12-06 23:38:04 +01:00
Milan Kolar
23d7bc5f0c add project code to publishes 2018-12-05 01:39:14 +01:00
Milan Kolar
33a59a52e8 changing the file gather for ftrack publishing a bit. fixes gathering of image sequences 2018-12-05 01:03:41 +01:00
Jakub Jezek
bf9813f7ef Merge branch 'feature/PYPE-32-nuke-integrate' into feature/PYPE-32-nuke-publish-write-sequence 2018-12-01 13:48:07 +01:00
Milan Kolar
5fffc69875 restore valiadte templates temporarily 2018-12-01 01:44:41 +01:00
Milan Kolar
4ae098e4d2 minor cleanups 2018-12-01 01:39:38 +01:00
Jakub Jezek
8ab05e7701 local render 2018-11-30 10:49:38 +01:00
Milan Kolar
4ae0630441 add review to integrator 2018-11-30 09:51:45 +01:00
Jakub Jezek
cb69f0dce1 cleaning up plugins/nuke/publish/*, updating collecting writes and render local 2018-11-29 18:41:47 +01:00
Jakub Jezek
80f41ed482 Merge branch 'develop' into feature/nuke_workflow 2018-11-27 08:29:08 +01:00