Commit graph

68 commits

Author SHA1 Message Date
Milan Kolar
bcd57e5177 Merge branch 'release/2.13.4' into 2.x/develop 2020-11-09 21:48:11 +01:00
iLLiCiTiT
7e4807e7ee path to ffmpeg tools has always quotes to make sure spaces won't cause unnecessary behavior 2020-11-02 19:13:48 +01:00
Ondřej Samohel
d21e6541e9
permit palette thumbnail creation to fail 2020-10-30 18:51:11 +01:00
Ondřej Samohel
32f76e3068
fixed palette extraction for unsupported types 2020-10-30 16:27:53 +01:00
Ondřej Samohel
1b69c712f1
collector fixes 2020-10-27 17:13:52 +01:00
Ondřej Samohel
3d54b9f754
extract js code from plugins 2020-10-20 16:28:17 +02:00
Ondřej Samohel
39b5a3e307
wip on refactor 2020-10-19 19:18:25 +02:00
Ondrej Samohel
3b22f0c199
js refactoring 2020-10-17 00:46:19 +02:00
Ondrej Samohel
5a1c5bae93
PypeHarmony and ImageSequenceLoader 2020-10-15 15:47:22 +02:00
Ondrej Samohel
5e575043ff
Merge remote-tracking branch 'origin/master' into feature/harmony-tweaks 2020-10-06 17:01:20 +02:00
Ondrej Samohel
437147d865
fps and style issues 2020-10-06 16:27:19 +02:00
iLLiCiTiT
9772bf7660 add audio to instance.data only if audio file exists 2020-10-06 14:07:52 +02:00
Ondrej Samohel
d0b6b6526c
make accessing data more efficient 2020-10-06 12:37:05 +02:00
Ondrej Samohel
e0ff9cc04f
fix QApp utilization and minor style changes 2020-10-05 23:15:31 +02:00
Ondrej Samohel
496a29ba99
fixing harmony js function signatures 2020-10-05 13:58:57 +02:00
Milan Kolar
81b328977d allow burnin in harmony 2020-09-10 20:54:11 +02:00
Milan Kolar
a2d3072fd6 extract render was duplicating extract review 2020-09-10 18:02:55 +02:00
Milan Kolar
7584d1ef72 load audio and refence in harmony 2020-08-21 15:29:49 +02:00
Milan Kolar
7cee74677d containerise all loaders 2020-08-12 22:20:25 +02:00
Milan Kolar
94b5b86cae .x/feature/maya_image_plane_containerize: 2020-08-12 22:03:13 +02:00
Milan Kolar
18100497a6 prep for background loading 2020-08-12 18:53:25 +02:00
Ondřej Samohel
58cd5f8c7e
fix invalid scope in validate scene settings 2020-08-12 12:06:40 +02:00
Milan Kolar
0c883a9f5b temp frame range filter implementation
temporary implementation for a client. must be cleaned up and logic should be changed to work based on task type
2020-08-04 21:38:29 +02:00
Milan Kolar
9a4c7673e9 temporary change to extract render logic
collection should eventually be phased out in favour of explicit render collection
2020-08-04 21:37:35 +02:00
Milan Kolar
cef1e9435b allow loading of workfiles as templates 2020-07-23 15:27:52 +02:00
Milan Kolar
fc27d6d2df render wasn't working without audio 2020-07-23 15:27:37 +02:00
Milan Kolar
582bb64026
Merge pull request #324 from tokejepsen/2.x/feature/support_palettes
Support palettes.
2020-07-08 09:05:23 +02:00
Milan Kolar
a482cc76fd
Merge pull request #310 from tokejepsen/2.x/bugfix/harmony_workfile_representations
Only zip files are supported.
2020-07-08 08:54:53 +02:00
Toke Stuart Jepsen
af8bcfafaa Only overwrite the .plt file and warn users about visual changes. 2020-07-01 10:33:03 +01:00
Toke Stuart Jepsen
1a15dc78ce Convert imageseuqnece loader 2020-06-28 16:23:05 +01:00
Toke Stuart Jepsen
279b221e33 Initial working version for palettes. 2020-06-28 15:40:00 +01:00
Toke Stuart Jepsen
5a7846a9fe Only zip files are supported. 2020-06-24 13:52:14 +01:00
Toke Stuart Jepsen
d2efd2e791 Merge branch '2.x/develop' into 2.x/feature/harmony_flag_inventory
# Conflicts:
#	pype/hosts/harmony/__init__.py
2020-06-23 15:51:58 +01:00
Toke Stuart Jepsen
85a298e4f5 Flag Outdated containers
- on startup as message box appears, and outdated containers are coloured red.
- on publish the "Validate Containers" errors.
- loaded image containers are coloured green.
2020-06-23 12:30:20 +01:00
Milan Kolar
d23339eec6
Merge pull request #290 from tokejepsen/2.x/feature/photoshop_increment_workfile
Increment workfile
2020-06-19 12:29:40 +02:00
Toke Stuart Jepsen
f3a435ee40 Increment workfile
and sneaky code cosmetic for Harmony.
2020-06-19 09:28:04 +01:00
Milan Kolar
9cd35c9612
Merge pull request #286 from tokejepsen/2.x/feature/harmony_audio
Load audio
2020-06-18 10:14:19 +02:00
Toke Stuart Jepsen
0ab4842c03 Load audio
- Audio on renders (reviews)
2020-06-17 15:37:57 +01:00
Toke Stuart Jepsen
48085fa8b9 Harmony scene validation needs to start at 1. 2020-06-17 15:35:42 +01:00
Milan Kolar
fc8784ecbc
Merge pull request #267 from tokejepsen/2.x/bugfix/harmony_publish_workfile
Fix publishing workfile
2020-06-16 18:36:07 +02:00
Milan Kolar
b24ccd9022
Merge pull request #271 from tokejepsen/2.x/feature/harmony_load_imagesequence
Load imagesequence.
2020-06-16 18:33:50 +02:00
Milan Kolar
3ca9c8cc18
Merge pull request #270 from tokejepsen/2.x/feature/harmony_validate_scene_settings
Validate scene settings.
2020-06-16 18:33:20 +02:00
Toke Stuart Jepsen
7b0c22ab5f Hound 2020-06-16 15:27:58 +01:00
Toke Stuart Jepsen
9042e606cf Load imagesequence. 2020-06-16 15:26:11 +01:00
Toke Stuart Jepsen
2c398c07ba Validate scene settings. 2020-06-16 15:06:57 +01:00
Toke Stuart Jepsen
65735c3d46 Fix extract render
Was not making a review movie for Ftrack.
2020-06-16 13:02:34 +01:00
Toke Stuart Jepsen
c69bf58d3b Fix publishing workfile
- Unified template export across workfile and templates.
- Fix scene saving per instance.
- Cleanup template loader.
2020-06-16 12:59:42 +01:00
Milan Kolar
b4bcf4646e
Merge pull request #253 from tokejepsen/2.x/feature/harmony_validate_instances
Validate instances
2020-06-16 10:19:25 +02:00
Milan Kolar
5ff939c283
Merge pull request #258 from tokejepsen/2.x/feature/standalone_editorial
Standalone editorial
2020-06-16 10:18:38 +02:00
Milan Kolar
eb9aa7c051
Merge pull request #250 from tokejepsen/2.x/feature/harmony_load_template_workfile
Loader for templates and workfiles
2020-06-16 10:17:22 +02:00