Commit graph

4310 commits

Author SHA1 Message Date
iLLiCiTiT
dde70634e1 replace backslash in hierararchy which may cause issues in burnin path 2020-01-08 16:18:36 +01:00
iLLiCiTiT
f89c1d3dbc added filled anatomy to burnin data to be able use anatomy[...][...] in burnin presets 2020-01-08 16:18:25 +01:00
iLLiCiTiT
023aec0a61 added template data to burnins data 2020-01-08 16:18:08 +01:00
jakub@orbi.tools
acd1ae66b5 Merge remote-tracking branch 'origin/temp/intent_merge_cherrypicked' into master-testing 2020-01-08 15:31:08 +01:00
iLLiCiTiT
264a7c177b set asset version custom attributes if there are any 2020-01-08 15:31:07 +01:00
iLLiCiTiT
19f2b8148c add intent value from context to custom attributes if is set 2020-01-08 15:31:00 +01:00
iLLiCiTiT
5bf0f2973d add custom attributes key to assetversion data in integrate frant instances 2020-01-08 15:30:47 +01:00
Jakub Jezek
fbb4c247f6 fix(global): fixing reformat and letter box 2020-01-08 00:38:08 +01:00
Jakub Jezek
ade2a26e84 feat(nuke): adding back baking mov from nuke 2020-01-08 00:02:14 +01:00
Jakub Jezek
67c1bfdf45 Merge branch 'master' into feature/PYPE-636-nuke-noninteractive-review-make 2020-01-07 13:30:27 +01:00
Jakub Jezek
8d18ee6390 Merge branch 'hotfix/burnin-right-side' 2020-01-07 13:13:28 +01:00
Jakub Jezek
0b0da93773 Merge branch 'hotfix/burnin-right-side' into develop 2020-01-07 13:13:27 +01:00
Jakub Jezek
26f2f882e2 fix(otio): burnin right side didnt format properly 2020-01-07 13:12:29 +01:00
Jakub Jezek
a82d82d626 Merge branch 'master' into feature/PYPE-636-nuke-noninteractive-review-make 2020-01-07 12:53:57 +01:00
Jakub Jezek
818670a9d0 Merge branch 'hotfix/PYPE-641-nk-nks-small-fixes' 2020-01-07 12:51:10 +01:00
Jakub Jezek
6616138ec3 Merge branch 'hotfix/PYPE-641-nk-nks-small-fixes' into develop 2020-01-07 12:51:09 +01:00
Jakub Jezek
a6af3ca90b fix(global): reformat didnt compare properly resolution float and int 2020-01-07 11:12:42 +01:00
iLLiCiTiT
f84f1537de formatting changes 2020-01-06 18:30:24 +01:00
iLLiCiTiT
3dac4c1b69 data from frobe are stored to data not to options 2020-01-06 18:30:17 +01:00
iLLiCiTiT
6f4d50d41d get_fps moved from Burnin class 2020-01-06 18:25:07 +01:00
iLLiCiTiT
bb86c94c18 width, height and fps values from ffprobe are added to options data 2020-01-06 18:10:19 +01:00
iLLiCiTiT
3d33f8fd4a added get_fps method to burnins class which calculate fps from r_frame_rate 2020-01-06 18:09:46 +01:00
Jakub Trllo
6a186024db Merged in bugfix/lighting_btns_font_size (pull request #411)
bugfix/lightbuttons_font_size

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 16:15:44 +00:00
Milan Kolar
76598d614f Merge branch 'develop' into feature/blender 2020-01-06 17:10:23 +01:00
Jakub Trllo
d5919053ce Merged in feature/PYPE-632_intent_integration (pull request #421)
Feature/PYPE-632 intent integration

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 15:10:26 +00:00
iLLiCiTiT
c71fc909ce set asset version custom attributes if there are any 2020-01-06 15:49:34 +01:00
Jakub Trllo
684dae0a96 Merged in feature/PYPE-626_template_in_burnins (pull request #417)
Feature/PYPE-626 template in burnins

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 14:49:20 +00:00
iLLiCiTiT
abe9334d5d add intent value from context to custom attributes if is set 2020-01-06 15:49:18 +01:00
iLLiCiTiT
25d2e135d9 add custom attributes key to assetversion data in integrate frant instances 2020-01-06 15:48:19 +01:00
Jakub Jezek
9009e99712 fix(global): passing resolution to context 2020-01-06 14:07:11 +01:00
Milan Kolar
b00566bce7 Merge remote-tracking branch 'origin/develop' into develop 2020-01-06 13:12:41 +01:00
Jakub Jezek
f9ddd368ea Merge branch 'master' into hotfix/PYPE-641-nk-nks-small-fixes 2020-01-06 12:43:56 +01:00
Jakub Jezek
68c8a253bf feat(nuke): lock range on setting frame ranges 2020-01-06 12:43:43 +01:00
Ondřej Samohel
3770fc8c42 Merged in hotfix/pype-lib-subprocess-pass-arguments (pull request #409)
(genera) fixing subprocess function to allow pass through Popen.subprocess arguments. Also adding better output for running subprocess

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 11:40:14 +00:00
Jakub Trllo
313b348128 Merged in bugfix/PYPE-643_seed_action_fix (pull request #420)
Bugfix/PYPE-643 seed action fix

Approved-by: Milan Kolar <milan@orbi.tools>
2020-01-06 11:37:30 +00:00
Milan Kolar
cd2f17bdbf Merge branch 'hotfix/ffmpeg_path_burnin_fix' 2020-01-06 12:33:41 +01:00
Milan Kolar
733ee06e9d Merge branch 'hotfix/ffmpeg_path_burnin_fix' into develop 2020-01-06 12:33:40 +01:00
Milan Kolar
275d2bae4a Merge branch 'hotfix/version_to_task_status_backwards_compatibility' 2020-01-06 12:20:36 +01:00
Milan Kolar
809a29156d Merge branch 'hotfix/version_to_task_status_backwards_compatibility' into develop 2020-01-06 12:20:36 +01:00
Milan Kolar
6d1b064d0b add previous behaviour as default 2020-01-06 12:19:56 +01:00
iLLiCiTiT
f20c4025c5 replace bpy.context.blend_data with bpy.data 2020-01-06 10:09:52 +01:00
Jakub Jezek
730fbdd509 fix(global): reformat didn't return correct data 2020-01-06 00:45:22 +01:00
iLLiCiTiT
080f1f6819 check if input values of seeder are greater than 0 2020-01-05 14:26:13 +01:00
iLLiCiTiT
0024688a44 convert input values to integer and set to 0 if not successful 2020-01-05 14:25:50 +01:00
iLLiCiTiT
73e50fa03f change label to see whole label value 2020-01-05 14:24:56 +01:00
Jakub Jezek
430920d999 Merge branch 'hotfix/nk-nks-small-fixes' into hotfix/PYPE-641-nk-nks-small-fixes 2020-01-04 17:42:10 +01:00
Jakub Jezek
cd4ad045e6 fix(nks): workio on save_as if Untitled didnt do anything 2020-01-04 17:14:31 +01:00
Jakub Jezek
bba0d10e91 feat(nuke): adding back plugin
renaming to only mov creation in running nuke session
2019-12-30 15:09:05 +01:00
Milan Kolar
ad1bc9a6a1 Merge remote-tracking branch 'origin/develop' into develop 2019-12-19 18:50:40 +01:00
iLLiCiTiT
2635268a49 modified blender action 2019-12-19 17:32:44 +01:00