Commit graph

424 commits

Author SHA1 Message Date
Milan Kolar
ee71d2420d add start and end frame to collection 2020-01-28 00:00:19 +01:00
Milan Kolar
6e1f4de58d fix environment filter typo 2020-01-27 23:59:36 +01:00
Ondrej Samohel
e186fcd388
Merge remote-tracking branch 'origin/develop' into feature/PYPE-634-pype-render-wrapper 2020-01-21 10:20:01 +01:00
Milan Kolar
82ac325448 Fix CG render publishing
Eallin production cherry picked and merged with current develop
2020-01-20 23:42:09 +01:00
Milan Kolar
5980c42d43 Merge branch 'develop' into master-dazzle-prod 2020-01-20 21:03:55 +01:00
Jakub Trllo
2fb0b5472b Merged in feature/dict_indentation (pull request #397)
Feature/dict indentation

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-20 19:59:57 +00:00
Jakub Jezek
4ddc5079da fix(global): if baked mov then do not integrate it if on farm 2020-01-20 18:07:24 +01:00
Jakub Jezek
e52687a6b7 fix(global): brushing the code 2020-01-20 17:33:03 +01:00
iLLiCiTiT
8891f9e360 Merge branch 'develop' into feature/dict_indentation 2020-01-20 17:25:00 +01:00
Jakub Jezek
3ecedad03b Merge branch 'develop' into master-dazzle-prod 2020-01-20 12:03:34 +01:00
Jakub Jezek
4df0ca8e62 fix: offset if slate in collect filesequence 2020-01-17 18:23:28 +01:00
iLLiCiTiT
57d53f3397 added datetime data to burnins data 2020-01-17 18:12:25 +01:00
Jakub Jezek
bab5fb45ff fix order of collect filesequence and anatomy collect 2020-01-17 17:30:22 +01:00
Jakub Jezek
af61c41319 Merge branch 'feature/nuke-slate-prerender' into master-dazzle-prod 2020-01-16 19:25:23 +01:00
Jakub Jezek
a84ac3b2db fix(global): deadline didnt publish all data to representation 2020-01-16 19:24:09 +01:00
Jakub Jezek
cb10d70cd8 Merge branch 'feature/nuke-slate-prerender' into master-dazzle-prod 2020-01-16 16:50:03 +01:00
Jakub Jezek
dad87fa395 fix(global): burnin didnt work if slate was not in families 2020-01-16 16:49:31 +01:00
jakub@orbi.tools
df8856cd5c Merge branch 'feature/nuke-slate-prerender' into master-testing-local 2020-01-16 13:06:53 +01:00
Jakub Jezek
aee72b9eac fix(nuke): deadline submission of slate family 2020-01-15 17:46:09 +01:00
jakub@orbi.tools
9c9d000747 Merge branch 'feature/nuke-slate-prerender' into master-testing-local
# Conflicts:
#	pype/plugins/nuke/publish/submit_nuke_deadline.py
2020-01-15 16:06:16 +01:00
Jakub Jezek
3e129d7a56 feat(nuke, global): adding slate family conditions 2020-01-15 16:04:49 +01:00
Jakub Jezek
b0d338fdb2 fix(global): refactoring environment collection 2020-01-15 10:57:52 +01:00
jakub@orbi.tools
13f08c7f1f Merge branch 'feature/nuke-slate-prerender' into master-testing-local
# Conflicts:
#	pype/plugins/global/publish/collect_filesequences.py
#	pype/plugins/global/publish/integrate_new.py
2020-01-14 19:58:03 +01:00
jakub@orbi.tools
3f1d5100e7 global fixing unc path submisison and deadline integrtion 2020-01-14 19:51:50 +01:00
Ondrej Samohel
1a6462d358
submitting jobs with limited env, pype location determination 2020-01-14 16:16:19 +01:00
Jiri Sindelar
6fe0f94e7b Merge remote-tracking branch 'origin/feature/nuke-slate-prerender' into master-testing-local 2020-01-14 15:46:10 +01:00
Jakub Jezek
c55a182ee8 fix(global): fix integrate_new p27 nukestudio pathlib error 2020-01-14 15:42:03 +01:00
Jiri Sindelar
102a4832ef Merge remote-tracking branch 'origin/feature/nuke-slate-prerender' into master-testing-local 2020-01-14 14:42:48 +01:00
Jakub Jezek
56943e77b3 feat(global): accepting slate frame in farm collector 2020-01-14 14:06:45 +01:00
jakub@orbi.tools
af0d4dafe3 Merge remote-tracking branch 'origin/feature/nuke-slate-prerender' into master-testing-local
# Conflicts:
#	pype/plugins/global/publish/integrate_new.py
2020-01-13 18:15:14 +01:00
Jakub Jezek
a132ef74eb Merge branch 'master' into feature/nuke-slate-prerender 2020-01-13 14:13:47 +01:00
Jakub Jezek
4de66d1bc8 fix(global, nuke): review in thumbnail, string from path 2020-01-13 14:12:09 +01:00
Milan Kolar
fcde886e0a hotfix- string convertion for pathlib path 2020-01-13 09:42:03 +01:00
Jakub Trllo
97b5ed3b27 Merged in feature/PYPE-638_res_and_fps_in_burnins (pull request #422)
Feature/PYPE-638 res and fps in burnins

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-13 08:26:45 +00:00
Jakub Jezek
09a38234e8 feat(global): adding slate to video files 2020-01-13 02:27:44 +01:00
Jakub Jezek
b714353983 fix(global): cleaning code and adding repre to render template 2020-01-13 02:27:05 +01:00
Jakub Jezek
6580d1881a fix(global): dealing with extension properly 2020-01-13 02:26:09 +01:00
Jakub Jezek
035cba879d fix(global): integrate new error with pathlib2 2020-01-12 14:41:16 +01:00
Milan Kolar
cc4857a5d8 hotfix/pathlib in integration 2020-01-11 14:56:48 +01:00
Milan Kolar
791bb63f97 collect templates fps fix 2020-01-10 18:11:33 +01:00
Jakub Jezek
2ae8dc7582 fix(global): unc pathlib2 was not used correctly 2020-01-10 17:47:23 +01:00
Milan Kolar
59305a1210 make sure template keys exist only when needed 2020-01-10 16:48:23 +01:00
Milan Kolar
301b011c2b Merge branch 'master' into feature/PYPE-638_res_and_fps_in_burnins 2020-01-10 16:05:11 +01:00
Jakub Jezek
d20853f617 feat(global): finalizing the nuke to deadline feature 2020-01-10 14:35:19 +01:00
Jakub Jezek
218405841c fix(global, nuke): updating deadline submission 2020-01-10 00:15:58 +01:00
Jakub Jezek
b3321a92ee fix(global): pathlib changed to pathlib2 2020-01-09 23:06:57 +01:00
Milan Kolar
5ace134b64 add pathlib path resolve 2020-01-09 15:24:51 +01:00
jakub@orbi.tools
98eced7157 Merge remote-tracking branch 'origin/feature/PYPE-636-nuke-noninteractive-review-make' into master-testing 2020-01-09 11:34:37 +01:00
jakub@orbi.tools
24ba47a8e6 Merge branch 'master' into master-testing 2020-01-09 11:34:08 +01:00
Jakub Jezek
64a0360ce9 fix(global): letter box not created properly 2020-01-09 11:08:35 +01:00