Commit graph

1197 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
Milan Kolar
06ed617d9b make ascii ass configurable via presets 2020-01-17 09:34:23 +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 Jezek
be031f71e2 Merge remote-tracking branch 'origin/feature/nuke-slate-prerender' into master-testing-local
# Conflicts:
#	pype/plugins/nuke/publish/submit_nuke_deadline.py
2020-01-16 15:56:55 +01:00
Jakub Jezek
0c35132839 feat(nuke): deadline submission with slate
and dependend noninteractive job
2020-01-16 15:56:02 +01:00
Jakub Jezek
675f637e8c Merge remote-tracking branch 'origin/hotfix/integrate_ftrack_with_avalon' into master-testing-local 2020-01-16 14:37:08 +01:00
iLLiCiTiT
1f96a74bac remove added code of previous commit 2020-01-16 14:30:26 +01:00
Ondřej Samohel
704ffdfc84 Merged in feature/yeti-resolve-env-variables-in-paths (pull request #432)
resolving `${TOKEN}` variables in PATH to env variables

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-16 12:50:15 +00: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
175a10f989 Merge remote-tracking branch 'origin/hotfix/integrate_ftrack_with_avalon' into master-testing-local 2020-01-15 16:55:30 +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
iLLiCiTiT
315dfe79a4 set ftrackId and entityType on entity when integrate hierarchy ftrack creates one 2020-01-15 15:36:54 +01:00
Jakub Jezek
b0d338fdb2 fix(global): refactoring environment collection 2020-01-15 10:57:52 +01:00
Jakub Jezek
b080f73a39 style(nuke): cleaning code 2020-01-15 10:57:15 +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
jakub@orbi.tools
a9257df48e nuke fixing deadline submission 2020-01-14 19:51:18 +01:00
jakub@orbi.tools
a2c80de603 Merge branch 'feature/nuke-slate-prerender' into master-testing-local 2020-01-14 16:41:59 +01:00
jakub@orbi.tools
71e63ec3e9 fix(nuke): better place for intent to add to slatenode 2020-01-14 16:40:50 +01:00
Ondrej Samohel
1a6462d358
submitting jobs with limited env, pype location determination 2020-01-14 16:16:19 +01:00
Milan Kolar
d3878b4f6c Merged in feature/blender (pull request #435)
Blender integration

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-14 14:51:53 +00:00
Milan Kolar
d6b9ac36d5 rename creator and collector 2020-01-14 15:50:48 +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
Milan Kolar
c43ae7cb5f allow exporting multiple arnold standins from single scene. 2020-01-14 15:43:26 +01:00
Jakub Jezek
c55a182ee8 fix(global): fix integrate_new p27 nukestudio pathlib error 2020-01-14 15:42:03 +01:00
Jakub Jezek
d5bb422121 fix(nuke): rename attribute, missing bracket 2020-01-14 15:11:48 +01:00
Jiri Sindelar
b5471a79b6 Merge remote-tracking branch 'origin/feature/nuke-slate-prerender' into master-testing-local 2020-01-14 14:45:32 +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
0ae3c2dc9c feat(nuke): comments to slate_node 2020-01-14 14:36:36 +01:00
Jakub Jezek
56943e77b3 feat(global): accepting slate frame in farm collector 2020-01-14 14:06:45 +01:00
Jakub Jezek
54c3fa9dac feat(nuke): slate no need to be representation 2020-01-14 13:56:12 +01:00
Milan Kolar
bdd31bf81d Merge branch 'develop' into feature/PYPE-612_blender 2020-01-14 13:48:07 +01:00
Jiri Sindelar
917a042b29 Merge remote-tracking branch 'origin/feature/nuke-slate-prerender' into master-testing-local 2020-01-14 11:12:28 +01:00