100 Commits

Author SHA1 Message Date
3789742cc8 Fixed little bug
Missed a function call in a69f4d3fd91958e2fdbc94e661bae10ba1d7f139.
2019-05-21 10:19:34 +02:00
a69f4d3fd9 Flamenco: Moved some code around, no semantic changes 2019-05-10 12:29:39 +02:00
94c5811e42 Typo 2019-04-18 12:58:34 +02:00
676ad1ed14 Removed unused import 2019-04-18 12:46:42 +02:00
e06fa3ea75 Flamenco: Support for Flamenco Manager settings version 2
When using Blender Cloud Add-on 1.12 or older, Flamenco Server will
automatically convert the Manager settings to version 1. As a result,
upgrading is recommended but not required to keep working with a newer
Flamenco Server.
2019-04-18 12:09:54 +02:00
97ad8bf5ba Flamenco: sort path replacement vars by replacement, not by variable name
The longer paths need to be replaced first. Not the longer variable name.
2019-04-18 11:07:36 +02:00
b0f7719add Fix pyrna_enum_to_py: current value matches no enum warnings 2019-03-26 12:36:13 +01:00
cb0393868e Flamenco: get JWT token from Flamenco Server when sending files to Shaman 2019-03-13 15:09:24 +01:00
60d1fbff50 Blender changed use_quit_dialog into use_save_prompt 2019-03-13 10:07:23 +01:00
352fe239f2 Flamenco: Use DNA enum value for format setting
See https://developer.blender.org/D4502 and https://developer.blender.org/rF032423271d0417aed3b6053adb8b6db2774b0d36
for more info.
2019-03-12 15:27:27 +01:00
ff9624d4f3 Blender Video Chunks: also allow .mp4 and .mov as container format 2019-03-06 13:31:30 +01:00
12eaaa5bae Set min job priority to 1
Previously the minimum was 0, but the server only accepts 1 and up.
2019-03-01 14:36:41 +01:00
f7396350db Add support for Shaman servers
See https://gitlab.com/blender-institute/shaman for more info
2019-02-28 12:53:29 +01:00
cc97288018 Create job first, then send files
This requires Flamenco Server 2.2 or newer.
2019-02-28 12:52:51 +01:00
ea81cc5769 Flamenco: Name render jobs just 'thefile' instead of 'Render thefile.flamenco.blend'
This makes the job list on Flamenco Server cleaner.
2019-02-13 15:18:33 +01:00
770b0121fa Flamenco: Different label for 'frame chunk' depending on render job type
The frame chunk size has a slightly different meaning when rendering
progressively (Flamenco Server can choose to chunk more frames together
when rendering a low number of samples).
2019-02-06 09:32:24 +01:00
2b155eac45 Flamenco: show a warning when the frame dimensions are not divisible by 2
Any 'Create Video' Flamenco task that's part of the job will pad the video
with black pixels to make the dimensions even, and this warning notifies
the artist about this.
2019-02-04 11:39:14 +01:00
d36959e91b Flamenco: Fixed tiny layout bug 2019-02-04 11:37:04 +01:00
6c38a432bc Flamenco: Added a hidden "Submit & Quit" button.
This button can be enabled in the add-on preferences and and then be
available on the Flamenco Render panel. Pressing the button will
silently close Blender after the job has been submitted to Flamenco (for
example to click, walk away, and free up memory for when the same
machine is part of the render farm).
2019-01-31 14:42:50 +01:00
53fa3e628a Flamenco: disable Cycles denoiser when progressive rendering
The denoiser data cannot be (easily) merged, so for now we just disable
the denoiser.
2019-01-30 16:10:09 +01:00
924fb45cb2 Flamenco: disallow progressive rendering unless Cycles is used 2019-01-30 16:06:39 +01:00
b5619757bc Flamenco: disallow progressive rendering on Blender < 2.80
Rendering ranges of sample chunks only works reliably for us after
Blender commit 7744203b7fde35a074faf232dda3595b78c5f14c (Tue Jan 29
18:08:12 2019 +0100).
2019-01-30 16:06:39 +01:00
ae41745743 Flamenco: easy button for setting max sample count for progressive rendering 2019-01-30 16:06:39 +01:00
ffab83f921 Flamenco: no longer use the word 'chunks' in the UI
It's a confusing word; 'Frames per Task' is clearer.
2019-01-30 16:06:39 +01:00
8bef2f48a5 Flamenco: Move job-type-specific options to a box below job type selector
This should make the relation between the job type and its options clearer.
2019-01-30 16:04:43 +01:00
74b46ff0db Flamenco: Progressive Rendering max sample count instead of chunk count
Flamenco Server changed from expecting a fixed number of sample chunks to
a compile-time determined number of nonuniform chunks. The artist can now
influence the size of each render task by setting a maximum number of
samples per render task.
2019-01-30 16:04:43 +01:00
e1934b20d9 Flamenco: nicer error reporting when creating a job fails 2019-01-30 13:05:09 +01:00
c4de4e9990 Fixed some MyPy warnings
This includes using `''` instead of `None` in some cases where an empty
string conveys 'nothing' equally well as `None`; in such cases keeping the
type the same rather than switching to another type is preferred.
2019-01-03 12:07:05 +01:00
5821611d89 Compatibility fix with Blender 2.79 (Python 3.5) 2018-12-28 12:29:25 +01:00
8899bff5e4 Fixed Flamenco exclusion filter bug
There was a mistake in an older version of the property tooltip, showing
semicolon-separated instead of space-separated. We now just handle both.
2018-12-07 12:25:48 +01:00
4fd4ad7448 Added 'blender-video-chunks' job type
Requires that the file is configured for rendering to Matroska video
files.

Audio is only extracted when there is an audio codec configured. This is
a bit arbitrary, but it's at least a way to tell whether the artist is
considering that there is audio of any relevance in the current blend
file.
2018-12-07 11:28:09 +01:00
4f32b49ad3 Flamenco: Allow BAT-packing of only relative-path assets 2018-12-06 15:46:54 +01:00
ef57dba5d3 Flamenco: Write more extensive information to jobinfo.json
This introduces version 2 of that file.

Version 1:
    - Only the job doc was saved, with 'missing_files' added inside it.

Version 2:
  - '_meta' key was added to indicate version.
  - 'job' is saved in a 'job' key, 'misssing_files' still top-level key.
  - 'exclusion_filter', 'project_settings', and
    'flamenco_manager_settings' keys were added.
2018-12-05 12:57:39 +01:00
419249ee19 Flamenco: Compress all blend files
All blend files in the BAT pack are now compressed, and not just the one
we save from Blender. Requires BAT 0.5 or newer.
2018-11-27 16:40:05 +01:00
113eb8f7ab Flamenco: add fps, output_file_extension, and images_or_video job settings
These are all needed to use FFmpeg on the worker to render a video from
rendered image sequences.

- fps: float, the scene FPS
- images_or_video: either 'images' or 'video', depending on what's being
  output by Blender. We don't support using FFmpeg to join chunked videos
  yet.
- output_file_extension: string like '.png' or '.exr', only set when
  outputting images (since doing this for video requires a lookup table and
  isn't even being used at the moment).
2018-11-21 14:24:32 +01:00
85f911cb59 Generalised saving/loading of project+manager-specific settings + added one
Added the `flamenco_exclude_filter` setting to the set, and also made it
easier to add new settings too.
2018-11-16 17:12:30 +01:00
80155ed4f4 Fixed storing & loading project+manager-specific settings
The problem was that there was too much storing done in an on-change
handler, causing things to be overwritten. By splitting up some functionality
and properly marking the "we're now loading" bits of code, its' solved.
2018-11-16 16:52:07 +01:00
fb9ffbbc23 Store available managers per project, and store chosen manager too 2018-09-04 17:38:21 +02:00
8367abeeb9 Fixed bad registration 2018-09-04 15:36:38 +02:00
2f5f82b1a8 Blender 2.80-compatible unregistration 2018-09-04 14:56:10 +02:00
87c90a7f72 Some more Blender 2.80 compatibility 2018-09-04 14:38:30 +02:00
b35d7bc5f3 Made the add-on more compatible with 2.80 and 2.79 2018-09-04 13:48:44 +02:00
973dafcc3a Store some flamenco job preferences on a per-manager basis
Managers often require distinct input and output path, which can now
be saved and loaded from the User Preferences, as well as in the
Flamenco panel.
2018-07-25 15:01:39 +02:00
62d16fff35 Display only Flamenco Managers linked to the current project 2018-07-24 15:44:12 +02:00
b0a03c81f5 Flamenco: allow jobs to be created in 'paused' state. 2018-07-12 11:54:13 +02:00
99f0764986 More efficient removal of Flamenco-specific Scene properties 2018-07-12 11:54:01 +02:00
f9c2dda9fa Fixed problem with relative project paths 2018-07-12 11:53:30 +02:00
0a99b9e22e Save jobinfo.json to output directory
Previously it would be saved in the same directory as the blend file, which
may be deeply nested in a directory structure. Now it's saved at the top
of the BAT pack.
2018-03-21 16:05:20 +01:00
0452fd845b Fix for some threading issue 2018-03-21 15:57:45 +01:00
c0a8602e17 Get the FLAMENCO_OT_copy_files operator up to par with the rest 2018-03-21 15:57:45 +01:00