2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2010-03-08 16:36:53 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2008 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*/
|
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
* \ingroup edrend
|
2011-02-27 20:29:51 +00:00
|
|
|
*/
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
#include <math.h>
|
|
|
|
#include <stddef.h>
|
2020-03-19 09:33:03 +01:00
|
|
|
#include <string.h>
|
2010-03-08 16:36:53 +00:00
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2015-06-30 14:47:31 +10:00
|
|
|
#include "BLI_listbase.h"
|
2010-03-28 13:45:19 +00:00
|
|
|
#include "BLI_math.h"
|
2020-12-18 09:15:55 +01:00
|
|
|
#include "BLI_rect.h"
|
2014-06-24 14:23:33 +06:00
|
|
|
#include "BLI_threads.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_timecode.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2013-06-24 22:41:24 +00:00
|
|
|
#include "PIL_time.h"
|
|
|
|
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2013-03-10 16:55:01 +00:00
|
|
|
|
2013-05-15 08:25:42 +00:00
|
|
|
#include "DNA_object_types.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
#include "DNA_scene_types.h"
|
2013-05-12 19:01:23 +00:00
|
|
|
#include "DNA_userdef_types.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "DNA_view3d_types.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2014-01-01 16:59:38 +06:00
|
|
|
#include "BKE_colortools.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_context.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
#include "BKE_global.h"
|
|
|
|
#include "BKE_image.h"
|
2020-02-10 12:58:59 +01:00
|
|
|
#include "BKE_lib_id.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
#include "BKE_main.h"
|
2010-12-17 17:06:36 +00:00
|
|
|
#include "BKE_node.h"
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
#include "BKE_object.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
#include "BKE_report.h"
|
2011-04-19 06:37:29 +00:00
|
|
|
#include "BKE_scene.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_screen.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
#include "DEG_depsgraph.h"
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
Blender Internal Render in viewport
Because of our release soon, feature has been added behind the Debug Menu.
CTRL+ALT+D and set it to -1. Or commandline --debug-value -1.
When debug set to -1, you can put the viewport to 'render' mode, just like
for Cycles. Notes for testers: (and please no bugs in tracker for this :)
- It renders without AA, MBlur, Panorama, Sequence, Composite
- Only active render layer gets rendered. Select another layer will re-render.
- But yes: it works for FreeStyle renders!
- Also does great for local view.
- BI is not well suited for incremental renders on view changes. This only
works for non-raytrace scenes, or zoom in ortho or camera mode, or for
Material changes. In most cases a full re-render is being done.
- ESC works to stop the preview render.
- Borders render as well. (CTRL+B)
- Force a refresh with arrow key left/right. A lot of settings don't trigger
re-render yet.
Tech notes:
- FreeStyle is adding a lot of temp objects/meshes in the Main database. This
caused DepsGraph to trigger changes (and redraws). I've prepended the names
for these temp objects with char number 27 (ESC), and made these names be
ignored for tag update checking.
- Fixed some bugs that were noticable with such excessive re-renders, like
for opening file window, quit during renders.
2013-04-16 17:39:20 +00:00
|
|
|
#include "ED_render.h"
|
|
|
|
#include "ED_screen.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "ED_util.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2019-04-20 12:47:06 +02:00
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
Blender Internal Render in viewport
Because of our release soon, feature has been added behind the Debug Menu.
CTRL+ALT+D and set it to -1. Or commandline --debug-value -1.
When debug set to -1, you can put the viewport to 'render' mode, just like
for Cycles. Notes for testers: (and please no bugs in tracker for this :)
- It renders without AA, MBlur, Panorama, Sequence, Composite
- Only active render layer gets rendered. Select another layer will re-render.
- But yes: it works for FreeStyle renders!
- Also does great for local view.
- BI is not well suited for incremental renders on view changes. This only
works for non-raytrace scenes, or zoom in ortho or camera mode, or for
Material changes. In most cases a full re-render is being done.
- ESC works to stop the preview render.
- Borders render as well. (CTRL+B)
- Force a refresh with arrow key left/right. A lot of settings don't trigger
re-render yet.
Tech notes:
- FreeStyle is adding a lot of temp objects/meshes in the Main database. This
caused DepsGraph to trigger changes (and redraws). I've prepended the names
for these temp objects with char number 27 (ESC), and made these names be
ignored for tag update checking.
- Fixed some bugs that were noticable with such excessive re-renders, like
for opening file window, quit during renders.
2013-04-16 17:39:20 +00:00
|
|
|
#include "RE_engine.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "RE_pipeline.h"
|
Blender Internal Render in viewport
Because of our release soon, feature has been added behind the Debug Menu.
CTRL+ALT+D and set it to -1. Or commandline --debug-value -1.
When debug set to -1, you can put the viewport to 'render' mode, just like
for Cycles. Notes for testers: (and please no bugs in tracker for this :)
- It renders without AA, MBlur, Panorama, Sequence, Composite
- Only active render layer gets rendered. Select another layer will re-render.
- But yes: it works for FreeStyle renders!
- Also does great for local view.
- BI is not well suited for incremental renders on view changes. This only
works for non-raytrace scenes, or zoom in ortho or camera mode, or for
Material changes. In most cases a full re-render is being done.
- ESC works to stop the preview render.
- Borders render as well. (CTRL+B)
- Force a refresh with arrow key left/right. A lot of settings don't trigger
re-render yet.
Tech notes:
- FreeStyle is adding a lot of temp objects/meshes in the Main database. This
caused DepsGraph to trigger changes (and redraws). I've prepended the names
for these temp objects with char number 27 (ESC), and made these names be
ignored for tag update checking.
- Fixed some bugs that were noticable with such excessive re-renders, like
for opening file window, quit during renders.
2013-04-16 17:39:20 +00:00
|
|
|
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
#include "IMB_colormanagement.h"
|
2010-03-08 16:36:53 +00:00
|
|
|
#include "IMB_imbuf_types.h"
|
|
|
|
|
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "RNA_define.h"
|
|
|
|
|
2020-12-19 06:44:57 +01:00
|
|
|
#include "SEQ_relations.h"
|
2020-11-01 21:03:31 +01:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
#include "render_intern.h"
|
|
|
|
|
2011-05-19 11:34:11 +00:00
|
|
|
/* Render Callbacks */
|
2013-01-22 02:21:21 +00:00
|
|
|
static int render_break(void *rjv);
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2014-01-01 16:59:38 +06:00
|
|
|
typedef struct RenderJob {
|
|
|
|
Main *main;
|
|
|
|
Scene *scene;
|
2018-04-24 15:20:17 +02:00
|
|
|
ViewLayer *single_layer;
|
2014-05-02 14:52:19 +02:00
|
|
|
Scene *current_scene;
|
2017-11-03 14:36:49 +01:00
|
|
|
/* TODO(sergey): Should not be needed once engine will have own
|
|
|
|
* depsgraph and copy-on-write will be implemented.
|
|
|
|
*/
|
|
|
|
Depsgraph *depsgraph;
|
2014-01-01 16:59:38 +06:00
|
|
|
Render *re;
|
|
|
|
struct Object *camera_override;
|
|
|
|
bool v3d_override;
|
2014-04-01 11:34:00 +11:00
|
|
|
bool anim, write_still;
|
2014-01-01 16:59:38 +06:00
|
|
|
Image *image;
|
|
|
|
ImageUser iuser;
|
|
|
|
bool image_outdated;
|
|
|
|
short *stop;
|
|
|
|
short *do_update;
|
|
|
|
float *progress;
|
|
|
|
ReportList *reports;
|
|
|
|
int orig_layer;
|
|
|
|
int last_layer;
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area;
|
2014-01-01 16:59:38 +06:00
|
|
|
ColorManagedViewSettings view_settings;
|
|
|
|
ColorManagedDisplaySettings display_settings;
|
2017-05-08 17:43:32 +02:00
|
|
|
bool supports_glsl_draw;
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
bool interface_locked;
|
2014-01-01 16:59:38 +06:00
|
|
|
} RenderJob;
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* called inside thread! */
|
2020-12-18 09:15:55 +01:00
|
|
|
static bool image_buffer_calc_tile_rect(const RenderResult *rr,
|
|
|
|
const ImBuf *ibuf,
|
|
|
|
volatile rcti *renrect,
|
|
|
|
rcti *r_ibuf_rect,
|
|
|
|
int *r_offset_x,
|
|
|
|
int *r_offset_y)
|
2010-03-08 16:36:53 +00:00
|
|
|
{
|
2020-12-18 09:15:55 +01:00
|
|
|
int tile_y, tile_height, tile_x, tile_width;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* if renrect argument, we only refresh scanlines */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (renrect) {
|
2020-12-18 09:15:55 +01:00
|
|
|
/* if (tile_height == recty), rendering of layer is ready,
|
2019-01-15 23:24:20 +11:00
|
|
|
* we should not draw, other things happen... */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rr->renlay == NULL || renrect->ymax >= rr->recty) {
|
2020-12-18 09:15:55 +01:00
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-12-18 09:15:55 +01:00
|
|
|
/* tile_x here is first subrect x coord, tile_width defines subrect width */
|
|
|
|
tile_x = renrect->xmin;
|
|
|
|
tile_width = renrect->xmax - tile_x;
|
|
|
|
if (tile_width < 2) {
|
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-12-18 09:15:55 +01:00
|
|
|
tile_y = renrect->ymin;
|
|
|
|
tile_height = renrect->ymax - tile_y;
|
|
|
|
if (tile_height < 2) {
|
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2012-03-24 02:51:46 +00:00
|
|
|
renrect->ymin = renrect->ymax;
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
|
|
|
else {
|
2020-12-18 09:15:55 +01:00
|
|
|
tile_x = tile_y = 0;
|
|
|
|
tile_width = rr->rectx;
|
|
|
|
tile_height = rr->recty;
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-12-18 09:15:55 +01:00
|
|
|
/* tile_x tile_y is in tile coords. transform to ibuf */
|
|
|
|
int offset_x = rr->tilerect.xmin;
|
|
|
|
if (offset_x >= ibuf->x) {
|
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-12-18 09:15:55 +01:00
|
|
|
int offset_y = rr->tilerect.ymin;
|
|
|
|
if (offset_y >= ibuf->y) {
|
|
|
|
return false;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-12-18 09:15:55 +01:00
|
|
|
if (offset_x + tile_width > ibuf->x) {
|
|
|
|
tile_width = ibuf->x - offset_x;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-12-18 09:15:55 +01:00
|
|
|
if (offset_y + tile_height > ibuf->y) {
|
|
|
|
tile_height = ibuf->y - offset_y;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-12-18 09:15:55 +01:00
|
|
|
if (tile_width < 1 || tile_height < 1) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
r_ibuf_rect->xmax = tile_x + tile_width;
|
|
|
|
r_ibuf_rect->ymax = tile_y + tile_height;
|
|
|
|
r_ibuf_rect->xmin = tile_x;
|
|
|
|
r_ibuf_rect->ymin = tile_y;
|
|
|
|
*r_offset_x = offset_x;
|
|
|
|
*r_offset_y = offset_y;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void image_buffer_rect_update(RenderJob *rj,
|
|
|
|
RenderResult *rr,
|
|
|
|
ImBuf *ibuf,
|
|
|
|
ImageUser *iuser,
|
|
|
|
const rcti *tile_rect,
|
|
|
|
int offset_x,
|
|
|
|
int offset_y,
|
|
|
|
const char *viewname)
|
|
|
|
{
|
|
|
|
Scene *scene = rj->scene;
|
|
|
|
const float *rectf = NULL;
|
|
|
|
int linear_stride, linear_offset_x, linear_offset_y;
|
|
|
|
ColorManagedViewSettings *view_settings;
|
|
|
|
ColorManagedDisplaySettings *display_settings;
|
|
|
|
|
|
|
|
if (ibuf->userflags & IB_DISPLAY_BUFFER_INVALID) {
|
|
|
|
/* The whole image buffer is to be color managed again anyway. */
|
2012-03-24 06:38:07 +00:00
|
|
|
return;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
/* The thing here is, the logic below (which was default behavior
|
|
|
|
* of how rectf is acquiring since forever) gives float buffer for
|
|
|
|
* composite output only. This buffer can not be used for other
|
|
|
|
* passes obviously.
|
|
|
|
*
|
|
|
|
* We might try finding corresponding for pass buffer in render result
|
|
|
|
* (which is actually missing when rendering with Cycles, who only
|
|
|
|
* writes all the passes when the tile is finished) or use float
|
|
|
|
* buffer from image buffer as reference, which is easier to use and
|
|
|
|
* contains all the data we need anyway.
|
|
|
|
* - sergey -
|
|
|
|
*/
|
|
|
|
/* TODO(sergey): Need to check has_combined here? */
|
2015-09-09 19:41:46 +05:00
|
|
|
if (iuser->pass == 0) {
|
2015-04-29 11:26:30 -03:00
|
|
|
RenderView *rv;
|
2015-10-24 01:01:10 +11:00
|
|
|
const int view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname);
|
2015-04-29 11:26:30 -03:00
|
|
|
rv = RE_RenderViewGetById(rr, view_id);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
/* find current float rect for display, first case is after composite... still weak */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rv->rectf) {
|
2015-04-29 11:26:30 -03:00
|
|
|
rectf = rv->rectf;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2015-04-29 11:26:30 -03:00
|
|
|
else {
|
|
|
|
if (rv->rect32) {
|
2013-12-17 23:42:38 +06:00
|
|
|
/* special case, currently only happens with sequencer rendering,
|
|
|
|
* which updates the whole frame, so we can only mark display buffer
|
|
|
|
* as invalid here (sergey)
|
|
|
|
*/
|
|
|
|
ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
|
|
|
|
return;
|
|
|
|
}
|
2020-07-03 17:30:31 +02:00
|
|
|
if (rr->renlay == NULL) {
|
|
|
|
return;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2020-07-03 17:30:31 +02:00
|
|
|
rectf = RE_RenderLayerGetPass(rr->renlay, RE_PASSNAME_COMBINED, viewname);
|
2013-12-17 23:42:38 +06:00
|
|
|
}
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rectf == NULL) {
|
2013-12-17 23:42:38 +06:00
|
|
|
return;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-12-18 09:15:55 +01:00
|
|
|
rectf += 4 * (rr->rectx * tile_rect->ymin + tile_rect->xmin);
|
2013-12-17 23:42:38 +06:00
|
|
|
linear_stride = rr->rectx;
|
2020-12-18 09:15:55 +01:00
|
|
|
linear_offset_x = offset_x;
|
|
|
|
linear_offset_y = offset_y;
|
2013-12-17 23:42:38 +06:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rectf = ibuf->rect_float;
|
|
|
|
linear_stride = ibuf->x;
|
|
|
|
linear_offset_x = 0;
|
|
|
|
linear_offset_y = 0;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-06-18 12:36:42 +02:00
|
|
|
view_settings = &scene->view_settings;
|
|
|
|
display_settings = &scene->display_settings;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
IMB_partial_display_buffer_update(ibuf,
|
|
|
|
rectf,
|
|
|
|
NULL,
|
|
|
|
linear_stride,
|
|
|
|
linear_offset_x,
|
|
|
|
linear_offset_y,
|
2014-01-01 16:59:38 +06:00
|
|
|
view_settings,
|
|
|
|
display_settings,
|
2020-12-18 09:15:55 +01:00
|
|
|
offset_x,
|
|
|
|
offset_y,
|
|
|
|
offset_x + BLI_rcti_size_x(tile_rect),
|
|
|
|
offset_y + BLI_rcti_size_y(tile_rect));
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ****************************** render invoking ***************** */
|
|
|
|
|
|
|
|
/* set callbacks, exported to sequence render too.
|
2012-03-03 16:31:46 +00:00
|
|
|
* Only call in foreground (UI) renders. */
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2018-07-04 13:00:46 +02:00
|
|
|
static void screen_render_single_layer_set(
|
|
|
|
wmOperator *op, Main *mainp, ViewLayer *active_layer, Scene **scene, ViewLayer **single_layer)
|
2011-10-23 17:52:20 +00:00
|
|
|
{
|
|
|
|
/* single layer re-render */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (RNA_struct_property_is_set(op->ptr, "scene")) {
|
2011-10-23 17:52:20 +00:00
|
|
|
Scene *scn;
|
2012-03-29 22:42:32 +00:00
|
|
|
char scene_name[MAX_ID_NAME - 2];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-10-23 17:52:20 +00:00
|
|
|
RNA_string_get(op->ptr, "scene", scene_name);
|
2019-03-08 09:29:17 +11:00
|
|
|
scn = (Scene *)BLI_findstring(&mainp->scenes, scene_name, offsetof(ID, name) + 2);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-10-23 17:52:20 +00:00
|
|
|
if (scn) {
|
|
|
|
/* camera switch wont have updated */
|
2012-03-29 22:42:32 +00:00
|
|
|
scn->r.cfra = (*scene)->r.cfra;
|
2012-05-05 14:33:36 +00:00
|
|
|
BKE_scene_camera_switch_update(scn);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-10-23 17:52:20 +00:00
|
|
|
*scene = scn;
|
|
|
|
}
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (RNA_struct_property_is_set(op->ptr, "layer")) {
|
2017-11-22 10:52:39 -02:00
|
|
|
ViewLayer *rl;
|
2011-10-23 17:52:20 +00:00
|
|
|
char rl_name[RE_MAXNAME];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-10-23 17:52:20 +00:00
|
|
|
RNA_string_get(op->ptr, "layer", rl_name);
|
2017-11-22 10:52:39 -02:00
|
|
|
rl = (ViewLayer *)BLI_findstring(&(*scene)->view_layers, rl_name, offsetof(ViewLayer, name));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rl) {
|
2018-04-24 15:20:17 +02:00
|
|
|
*single_layer = rl;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2018-04-24 15:20:17 +02:00
|
|
|
}
|
2018-07-04 13:00:46 +02:00
|
|
|
else if (((*scene)->r.scemode & R_SINGLE_LAYER) && active_layer) {
|
|
|
|
*single_layer = active_layer;
|
2011-10-23 17:52:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* executes blocking render */
|
|
|
|
static int screen_render_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2018-04-17 13:35:05 +02:00
|
|
|
RenderEngineType *re_type = RE_engines_find(scene->r.engine);
|
2018-07-04 13:00:46 +02:00
|
|
|
ViewLayer *active_layer = CTX_data_view_layer(C);
|
2018-04-24 15:20:17 +02:00
|
|
|
ViewLayer *single_layer = NULL;
|
2011-11-01 14:51:44 +00:00
|
|
|
Render *re;
|
2010-03-27 15:35:34 +00:00
|
|
|
Image *ima;
|
2012-03-29 22:42:32 +00:00
|
|
|
View3D *v3d = CTX_wm_view3d(C);
|
|
|
|
Main *mainp = CTX_data_main(C);
|
2014-01-28 03:52:21 +11:00
|
|
|
const bool is_animation = RNA_boolean_get(op->ptr, "animation");
|
|
|
|
const bool is_write_still = RNA_boolean_get(op->ptr, "write_still");
|
2012-03-29 22:42:32 +00:00
|
|
|
struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-01-29 17:09:38 +01:00
|
|
|
/* Cannot do render if there is not this function. */
|
2018-05-30 14:32:47 +02:00
|
|
|
if (re_type->render == NULL) {
|
2018-01-29 17:09:38 +01:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-11-01 14:51:44 +00:00
|
|
|
/* custom scene and single layer re-render */
|
2018-07-04 13:00:46 +02:00
|
|
|
screen_render_single_layer_set(op, mainp, active_layer, &scene, &single_layer);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_report(
|
|
|
|
op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");
|
2010-11-16 14:40:46 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-09-12 11:27:22 +05:00
|
|
|
re = RE_NewSceneRender(scene);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
G.is_break = false;
|
2020-02-17 17:21:42 +11:00
|
|
|
|
|
|
|
RE_draw_lock_cb(re, NULL, NULL);
|
2013-01-22 02:21:21 +00:00
|
|
|
RE_test_break_cb(re, NULL, render_break);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-03-06 13:02:59 +11:00
|
|
|
ima = BKE_image_ensure_viewer(mainp, IMA_TYPE_R_RESULT, "Render Result");
|
2018-06-11 15:40:37 +02:00
|
|
|
BKE_image_signal(mainp, ima, NULL, IMA_SIGNAL_FREE);
|
2015-11-30 00:51:30 +01:00
|
|
|
BKE_image_backup_render(scene, ima, true);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-08-08 16:47:58 +00:00
|
|
|
/* cleanup sequencer caches before starting user triggered render.
|
2012-04-22 11:54:53 +00:00
|
|
|
* otherwise, invalidated cache entries can make their way into
|
2019-05-06 17:36:34 +02:00
|
|
|
* the output rendering. We can't put that into RE_RenderFrame,
|
2012-04-22 11:54:53 +00:00
|
|
|
* since sequence rendering can call that recursively... (peter) */
|
2020-12-19 05:57:27 +01:00
|
|
|
SEQ_cache_cleanup(scene);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-06-28 16:25:07 +00:00
|
|
|
RE_SetReports(re, op->reports);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (is_animation) {
|
2019-05-06 17:36:34 +02:00
|
|
|
RE_RenderAnim(re,
|
|
|
|
mainp,
|
|
|
|
scene,
|
|
|
|
single_layer,
|
|
|
|
camera_override,
|
|
|
|
scene->r.sfra,
|
|
|
|
scene->r.efra,
|
|
|
|
scene->r.frame_step);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
else {
|
2019-05-06 17:36:34 +02:00
|
|
|
RE_RenderFrame(re, mainp, scene, single_layer, camera_override, scene->r.cfra, is_write_still);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-06-28 16:25:07 +00:00
|
|
|
RE_SetReports(re, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* No redraw needed, we leave state as we entered it. */
|
2019-07-25 16:36:22 +02:00
|
|
|
ED_update_for_newframe(mainp, CTX_data_depsgraph_pointer(C));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-29 22:42:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void render_freejob(void *rjv)
|
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
RenderJob *rj = rjv;
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2014-01-01 16:59:38 +06:00
|
|
|
BKE_color_managed_view_settings_free(&rj->view_settings);
|
2010-03-08 16:36:53 +00:00
|
|
|
MEM_freeN(rj);
|
|
|
|
}
|
|
|
|
|
2010-03-27 15:35:34 +00:00
|
|
|
/* str is IMA_MAX_RENDER_TEXT in size */
|
2014-12-05 21:56:29 +05:00
|
|
|
static void make_renderinfo_string(const RenderStats *rs,
|
|
|
|
const Scene *scene,
|
|
|
|
const bool v3d_override,
|
|
|
|
const char *error,
|
|
|
|
char *str)
|
2010-03-08 16:36:53 +00:00
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
char info_time_str[32]; /* used to be extern to header_info.c */
|
2020-05-20 00:24:26 +02:00
|
|
|
uintptr_t mem_in_use, peak_memory;
|
|
|
|
float megs_used_memory, megs_peak_memory;
|
2012-03-29 22:42:32 +00:00
|
|
|
char *spos = str;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-29 22:42:32 +00:00
|
|
|
mem_in_use = MEM_get_memory_in_use();
|
2010-05-04 12:31:24 +00:00
|
|
|
peak_memory = MEM_get_peak_memory();
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-05-20 00:24:26 +02:00
|
|
|
megs_used_memory = (mem_in_use) / (1024.0 * 1024.0);
|
2012-03-29 22:42:32 +00:00
|
|
|
megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-24 22:41:24 +00:00
|
|
|
/* local view */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rs->localview) {
|
2019-06-11 22:25:01 +02:00
|
|
|
spos += sprintf(spos, "%s | ", TIP_("3D Local View"));
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
else if (v3d_override) {
|
2019-06-11 22:25:01 +02:00
|
|
|
spos += sprintf(spos, "%s | ", TIP_("3D View"));
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-24 22:41:24 +00:00
|
|
|
/* frame number */
|
2019-06-11 22:25:01 +02:00
|
|
|
spos += sprintf(spos, TIP_("Frame:%d "), (scene->r.cfra));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-24 22:41:24 +00:00
|
|
|
/* previous and elapsed time */
|
2015-06-30 14:47:31 +10:00
|
|
|
BLI_timecode_string_from_time_simple(info_time_str, sizeof(info_time_str), rs->lastframetime);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-24 22:41:24 +00:00
|
|
|
if (rs->infostr && rs->infostr[0]) {
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rs->lastframetime != 0.0) {
|
2019-06-11 22:25:01 +02:00
|
|
|
spos += sprintf(spos, TIP_("| Last:%s "), info_time_str);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
else {
|
2013-06-24 22:41:24 +00:00
|
|
|
spos += sprintf(spos, "| ");
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-06-30 14:47:31 +10:00
|
|
|
BLI_timecode_string_from_time_simple(
|
|
|
|
info_time_str, sizeof(info_time_str), PIL_check_seconds_timer() - rs->starttime);
|
2013-06-24 22:41:24 +00:00
|
|
|
}
|
2019-04-22 09:19:45 +10:00
|
|
|
else {
|
2013-06-24 22:41:24 +00:00
|
|
|
spos += sprintf(spos, "| ");
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-06-11 22:25:01 +02:00
|
|
|
spos += sprintf(spos, TIP_("Time:%s "), info_time_str);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-24 22:41:24 +00:00
|
|
|
/* statistics */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (rs->statstr) {
|
2013-06-25 10:44:30 +00:00
|
|
|
if (rs->statstr[0]) {
|
2013-06-24 22:41:24 +00:00
|
|
|
spos += sprintf(spos, "| %s ", rs->statstr);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2013-06-25 10:44:30 +00:00
|
|
|
}
|
2010-03-08 16:36:53 +00:00
|
|
|
else {
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rs->mem_peak == 0.0f) {
|
2020-05-20 00:24:26 +02:00
|
|
|
spos += sprintf(spos, TIP_("| Mem:%.2fM (Peak %.2fM) "), megs_used_memory, megs_peak_memory);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
else {
|
2019-06-11 22:25:01 +02:00
|
|
|
spos += sprintf(spos, TIP_("| Mem:%.2fM, Peak: %.2fM "), rs->mem_used, rs->mem_peak);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-24 22:41:24 +00:00
|
|
|
/* extra info */
|
2014-12-05 21:56:29 +05:00
|
|
|
if (rs->infostr && rs->infostr[0]) {
|
2012-03-29 22:42:32 +00:00
|
|
|
spos += sprintf(spos, "| %s ", rs->infostr);
|
2014-12-05 21:56:29 +05:00
|
|
|
}
|
|
|
|
else if (error && error[0]) {
|
|
|
|
spos += sprintf(spos, "| %s ", error);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* very weak... but 512 characters is quite safe */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (spos >= str + IMA_MAX_RENDER_TEXT) {
|
|
|
|
if (G.debug & G_DEBUG) {
|
2012-03-31 00:59:17 +00:00
|
|
|
printf("WARNING! renderwin text beyond limit\n");
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
}
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void image_renderinfo_cb(void *rjv, RenderStats *rs)
|
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
RenderJob *rj = rjv;
|
2010-03-27 15:35:34 +00:00
|
|
|
RenderResult *rr;
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2012-03-29 22:42:32 +00:00
|
|
|
rr = RE_AcquireResultRead(rj->re);
|
2010-07-05 09:31:24 +00:00
|
|
|
|
2014-12-05 21:56:29 +05:00
|
|
|
if (rr) {
|
|
|
|
/* malloc OK here, stats_draw is not in tile threads */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rr->text == NULL) {
|
2014-12-05 21:56:29 +05:00
|
|
|
rr->text = MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext");
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2010-03-27 15:35:34 +00:00
|
|
|
make_renderinfo_string(rs, rj->scene, rj->v3d_override, rr->error, rr->text);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
RE_ReleaseResult(rj->re);
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2011-12-07 11:29:24 +00:00
|
|
|
/* make jobs timer to send notifier */
|
2014-04-01 11:34:00 +11:00
|
|
|
*(rj->do_update) = true;
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
|
|
|
|
2010-05-27 08:22:16 +00:00
|
|
|
static void render_progress_update(void *rjv, float progress)
|
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
RenderJob *rj = rjv;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (rj->progress && *rj->progress != progress) {
|
2010-05-27 08:22:16 +00:00
|
|
|
*rj->progress = progress;
|
2011-12-07 11:29:24 +00:00
|
|
|
|
|
|
|
/* make jobs timer to send notifier */
|
2014-04-01 11:34:00 +11:00
|
|
|
*(rj->do_update) = true;
|
2011-12-07 11:29:24 +00:00
|
|
|
}
|
2010-05-27 08:22:16 +00:00
|
|
|
}
|
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
/* Not totally reliable, but works fine in most of cases and
|
|
|
|
* in worst case would just make it so extra color management
|
|
|
|
* for the whole render result is applied (which was already
|
|
|
|
* happening already).
|
|
|
|
*/
|
|
|
|
static void render_image_update_pass_and_layer(RenderJob *rj, RenderResult *rr, ImageUser *iuser)
|
|
|
|
{
|
|
|
|
wmWindowManager *wm;
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *first_area = NULL, *matched_area = NULL;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
/* image window, compo node users */
|
2020-04-03 13:25:03 +02:00
|
|
|
for (wm = rj->main->wm.first; wm && matched_area == NULL; wm = wm->id.next) { /* only 1 wm */
|
2013-12-17 23:42:38 +06:00
|
|
|
wmWindow *win;
|
2020-04-03 13:25:03 +02:00
|
|
|
for (win = wm->windows.first; win && matched_area == NULL; win = win->next) {
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
const bScreen *screen = WM_window_get_active_screen(win);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
2020-04-03 13:25:03 +02:00
|
|
|
if (area->spacetype == SPACE_IMAGE) {
|
|
|
|
SpaceImage *sima = area->spacedata.first;
|
|
|
|
/* area->spacedata might be empty when toggling full-screen mode. */
|
2014-04-11 16:17:59 +06:00
|
|
|
if (sima != NULL && sima->image == rj->image) {
|
2020-04-03 13:25:03 +02:00
|
|
|
if (first_area == NULL) {
|
|
|
|
first_area = area;
|
2013-12-17 23:42:38 +06:00
|
|
|
}
|
2020-04-03 13:25:03 +02:00
|
|
|
if (area == rj->area) {
|
|
|
|
matched_area = area;
|
2013-12-17 23:42:38 +06:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
if (matched_area == NULL) {
|
|
|
|
matched_area = first_area;
|
2013-12-17 23:42:38 +06:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
if (matched_area) {
|
|
|
|
SpaceImage *sima = matched_area->spacedata.first;
|
2013-12-17 23:42:38 +06:00
|
|
|
RenderResult *main_rr = RE_AcquireResultRead(rj->re);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
/* TODO(sergey): is there faster way to get the layer index? */
|
|
|
|
if (rr->renlay) {
|
|
|
|
int layer = BLI_findstringindex(
|
|
|
|
&main_rr->layers, (char *)rr->renlay->name, offsetof(RenderLayer, name));
|
2018-03-15 23:36:15 +01:00
|
|
|
sima->iuser.layer = layer;
|
|
|
|
rj->last_layer = layer;
|
2013-12-17 23:42:38 +06:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-09-09 19:41:46 +05:00
|
|
|
iuser->pass = sima->iuser.pass;
|
2013-12-17 23:42:38 +06:00
|
|
|
iuser->layer = sima->iuser.layer;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
RE_ReleaseResult(rj->re);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrect)
|
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
RenderJob *rj = rjv;
|
|
|
|
Image *ima = rj->image;
|
2010-03-08 16:36:53 +00:00
|
|
|
ImBuf *ibuf;
|
|
|
|
void *lock;
|
2015-04-06 10:40:12 -03:00
|
|
|
const char *viewname = RE_GetActiveRenderView(rj->re);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-04-01 12:51:24 +00:00
|
|
|
/* only update if we are displaying the slot being rendered */
|
2013-09-03 20:59:24 +00:00
|
|
|
if (ima->render_slot != ima->last_render_slot) {
|
|
|
|
rj->image_outdated = true;
|
2010-04-01 12:51:24 +00:00
|
|
|
return;
|
2013-09-03 20:59:24 +00:00
|
|
|
}
|
2020-07-03 17:30:31 +02:00
|
|
|
if (rj->image_outdated) {
|
2021-05-03 19:09:08 +02:00
|
|
|
/* Free all render buffer caches when switching slots, with lock to ensure main
|
|
|
|
* thread is not drawing the buffer at the same time. */
|
2013-09-03 20:59:24 +00:00
|
|
|
rj->image_outdated = false;
|
2021-05-03 19:09:08 +02:00
|
|
|
ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock);
|
|
|
|
BKE_image_free_buffers(ima);
|
|
|
|
BKE_image_release_ibuf(ima, ibuf, lock);
|
2014-04-01 11:34:00 +11:00
|
|
|
*(rj->do_update) = true;
|
2013-09-03 20:59:24 +00:00
|
|
|
return;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rr == NULL) {
|
2014-03-05 17:42:48 +01:00
|
|
|
return;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-09-03 20:59:24 +00:00
|
|
|
/* update part of render */
|
2013-12-17 23:42:38 +06:00
|
|
|
render_image_update_pass_and_layer(rj, rr, &rj->iuser);
|
2020-12-18 09:15:55 +01:00
|
|
|
rcti tile_rect;
|
|
|
|
int offset_x;
|
|
|
|
int offset_y;
|
2012-03-29 22:42:32 +00:00
|
|
|
ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ibuf) {
|
2020-12-18 09:15:55 +01:00
|
|
|
if (!image_buffer_calc_tile_rect(rr, ibuf, renrect, &tile_rect, &offset_x, &offset_y)) {
|
|
|
|
BKE_image_release_ibuf(ima, ibuf, lock);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
/* Don't waste time on CPU side color management if
|
|
|
|
* image will be displayed using GLSL.
|
2014-01-01 16:59:38 +06:00
|
|
|
*
|
|
|
|
* Need to update rect if Save Buffers enabled because in
|
|
|
|
* this case GLSL doesn't have original float buffer to
|
|
|
|
* operate with.
|
2013-12-17 23:42:38 +06:00
|
|
|
*/
|
2019-06-18 12:47:16 +02:00
|
|
|
if (!rj->supports_glsl_draw || ibuf->channels == 1 ||
|
2019-04-20 12:47:06 +02:00
|
|
|
ED_draw_imbuf_method(ibuf) != IMAGE_DRAW_METHOD_GLSL) {
|
2020-12-18 09:15:55 +01:00
|
|
|
image_buffer_rect_update(rj, rr, ibuf, &rj->iuser, &tile_rect, offset_x, offset_y, viewname);
|
2013-12-17 23:42:38 +06:00
|
|
|
}
|
2020-12-18 09:15:55 +01:00
|
|
|
BKE_image_update_gputexture_delayed(
|
|
|
|
ima, ibuf, offset_x, offset_y, BLI_rcti_size_x(&tile_rect), BLI_rcti_size_y(&tile_rect));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* make jobs timer to send notifier */
|
2014-04-01 11:34:00 +11:00
|
|
|
*(rj->do_update) = true;
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
2012-11-15 15:59:58 +00:00
|
|
|
BKE_image_release_ibuf(ima, ibuf, lock);
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
|
|
|
|
2014-05-02 14:52:19 +02:00
|
|
|
static void current_scene_update(void *rjv, Scene *scene)
|
|
|
|
{
|
|
|
|
RenderJob *rj = rjv;
|
|
|
|
rj->current_scene = scene;
|
|
|
|
rj->iuser.scene = scene;
|
|
|
|
}
|
|
|
|
|
2010-05-27 08:22:16 +00:00
|
|
|
static void render_startjob(void *rjv, short *stop, short *do_update, float *progress)
|
2010-03-08 16:36:53 +00:00
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
RenderJob *rj = rjv;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-29 22:42:32 +00:00
|
|
|
rj->stop = stop;
|
|
|
|
rj->do_update = do_update;
|
|
|
|
rj->progress = progress;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-06-28 16:25:07 +00:00
|
|
|
RE_SetReports(rj->re, rj->reports);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rj->anim) {
|
2019-05-06 17:36:34 +02:00
|
|
|
RE_RenderAnim(rj->re,
|
|
|
|
rj->main,
|
|
|
|
rj->scene,
|
|
|
|
rj->single_layer,
|
|
|
|
rj->camera_override,
|
|
|
|
rj->scene->r.sfra,
|
|
|
|
rj->scene->r.efra,
|
|
|
|
rj->scene->r.frame_step);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
RE_RenderFrame(rj->re,
|
2018-10-16 12:45:41 +02:00
|
|
|
rj->main,
|
|
|
|
rj->scene,
|
|
|
|
rj->single_layer,
|
|
|
|
rj->camera_override,
|
2019-05-06 17:36:34 +02:00
|
|
|
rj->scene->r.cfra,
|
|
|
|
rj->write_still);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-06-28 16:25:07 +00:00
|
|
|
RE_SetReports(rj->re, NULL);
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
static void render_image_restore_layer(RenderJob *rj)
|
|
|
|
{
|
|
|
|
wmWindowManager *wm;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-12-17 23:42:38 +06:00
|
|
|
/* image window, compo node users */
|
|
|
|
for (wm = rj->main->wm.first; wm; wm = wm->id.next) { /* only 1 wm */
|
|
|
|
wmWindow *win;
|
|
|
|
for (win = wm->windows.first; win; win = win->next) {
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
const bScreen *screen = WM_window_get_active_screen(win);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
2020-04-03 13:25:03 +02:00
|
|
|
if (area == rj->area) {
|
|
|
|
if (area->spacetype == SPACE_IMAGE) {
|
|
|
|
SpaceImage *sima = area->spacedata.first;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-03-15 23:36:15 +01:00
|
|
|
if (RE_HasSingleLayer(rj->re)) {
|
|
|
|
/* For single layer renders keep the active layer
|
|
|
|
* visible, or show the compositing result. */
|
|
|
|
RenderResult *rr = RE_AcquireResultRead(rj->re);
|
2018-04-06 10:47:39 +02:00
|
|
|
if (RE_HasCombinedLayer(rr)) {
|
2018-03-15 23:36:15 +01:00
|
|
|
sima->iuser.layer = 0;
|
|
|
|
}
|
|
|
|
RE_ReleaseResult(rj->re);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* For multiple layer render, set back the layer
|
|
|
|
* that was set at the start of rendering. */
|
|
|
|
sima->iuser.layer = rj->orig_layer;
|
|
|
|
}
|
2013-12-17 23:42:38 +06:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-04-15 10:28:32 +00:00
|
|
|
static void render_endjob(void *rjv)
|
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
RenderJob *rj = rjv;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-01-15 23:24:20 +11:00
|
|
|
/* this render may be used again by the sequencer without the active
|
|
|
|
* 'Render' where the callbacks would be re-assigned. assign dummy callbacks
|
|
|
|
* to avoid referencing freed renderjobs bug T24508. */
|
2010-11-03 11:14:02 +00:00
|
|
|
RE_InitRenderCB(rj->re);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rj->main != G_MAIN) {
|
2013-12-30 13:25:27 +11:00
|
|
|
BKE_main_free(rj->main);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-11-02 09:34:32 +00:00
|
|
|
/* else the frame will not update for the original value */
|
2013-06-10 13:53:38 +00:00
|
|
|
if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) {
|
2012-06-01 15:05:30 +00:00
|
|
|
/* possible this fails of loading new file while rendering */
|
2018-06-19 19:30:47 +02:00
|
|
|
if (G_MAIN->wm.first) {
|
|
|
|
ED_update_for_newframe(G_MAIN, rj->depsgraph);
|
2012-06-01 15:05:30 +00:00
|
|
|
}
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-02-07 16:41:57 +00:00
|
|
|
/* XXX above function sets all tags in nodes */
|
2011-10-19 17:08:35 +00:00
|
|
|
ntreeCompositClearTags(rj->scene->nodetree);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-02-07 18:09:27 +00:00
|
|
|
/* potentially set by caller */
|
|
|
|
rj->scene->r.scemode &= ~R_NO_FRAME_UPDATE;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-24 15:20:17 +02:00
|
|
|
if (rj->single_layer) {
|
2011-10-19 17:08:35 +00:00
|
|
|
nodeUpdateID(rj->scene->nodetree, &rj->scene->id);
|
2012-03-29 22:42:32 +00:00
|
|
|
WM_main_add_notifier(NC_NODE | NA_EDITED, rj->scene);
|
2010-12-17 17:06:36 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
if (rj->area) {
|
2013-12-17 23:42:38 +06:00
|
|
|
render_image_restore_layer(rj);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-04-15 10:28:32 +00:00
|
|
|
/* XXX render stability hack */
|
2014-04-01 11:34:00 +11:00
|
|
|
G.is_rendering = false;
|
2013-06-25 10:44:30 +00:00
|
|
|
WM_main_add_notifier(NC_SCENE | ND_RENDER_RESULT, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Bunch of fixes for GLSL display transform
- GLSL shader wasn't aware of alpha predivide option,
always assuming alpha is straight. Gave wrong results
when displaying transparent float buffers.
- GLSL display wasn't aware of float buffers with number
of channels different from 4, crashing when trying to
display image with different number of channels.
This required a bit larger changes, namely now it's
possible to pass format (GL_RGB, GL_RGBAm GL_LUMINANCE)
to glaDrawPixelsTex, This also implied adding format to
glaDrawPixelsAuto and modifying all places where this
functions are called.
Now GLSL will handle both 3 and 4 channels buffers,
single channel images are handled by CPU.
- Replaced hack for render result displaying with a bit
different hack.
Namely CPU conversion will happen only during render,
once render is done GLSL would be used for displaying
render result on a screen.
This is so because of the way renderer updates parts
of the image -- it happens without respect to active
render layer in image user. This is harmless because
only display buffer is modifying, but this is tricky
because we don't have original buffer opened during
rendering.
One more related fix here was about when rendering
multiple layers, wrong image would be displaying when
rendering is done. Added a signal to invalidate
display buffer once rendering is done (only happens
when using multiple layers). This solves issue with
wrong buffer stuck on the display when using regular
CPU display space transform and if GLSL is available
it'll make image displayed with a GLSL shader.
- As an additional change, byte buffers now also uses
GLSL display transform.
So now only dutehr and RGB curves are stoppers for
using GLSL for all kind of display transforms.
2013-04-03 15:59:54 +00:00
|
|
|
/* Partial render result will always update display buffer
|
|
|
|
* for first render layer only. This is nice because you'll
|
|
|
|
* see render progress during rendering, but it ends up in
|
|
|
|
* wrong display buffer shown after rendering.
|
|
|
|
*
|
|
|
|
* The code below will mark display buffer as invalid after
|
|
|
|
* rendering in case multiple layers were rendered, which
|
|
|
|
* ensures display buffer matches render layer after
|
|
|
|
* rendering.
|
|
|
|
*
|
|
|
|
* Perhaps proper way would be to toggle active render
|
|
|
|
* layer in image editor and job, so we always display
|
|
|
|
* layer being currently rendered. But this is not so much
|
|
|
|
* trivial at this moment, especially because of external
|
|
|
|
* engine API, so lets use simple and robust way for now
|
|
|
|
* - sergey -
|
|
|
|
*/
|
2017-11-22 10:52:39 -02:00
|
|
|
if (rj->scene->view_layers.first != rj->scene->view_layers.last || rj->image_outdated) {
|
Bunch of fixes for GLSL display transform
- GLSL shader wasn't aware of alpha predivide option,
always assuming alpha is straight. Gave wrong results
when displaying transparent float buffers.
- GLSL display wasn't aware of float buffers with number
of channels different from 4, crashing when trying to
display image with different number of channels.
This required a bit larger changes, namely now it's
possible to pass format (GL_RGB, GL_RGBAm GL_LUMINANCE)
to glaDrawPixelsTex, This also implied adding format to
glaDrawPixelsAuto and modifying all places where this
functions are called.
Now GLSL will handle both 3 and 4 channels buffers,
single channel images are handled by CPU.
- Replaced hack for render result displaying with a bit
different hack.
Namely CPU conversion will happen only during render,
once render is done GLSL would be used for displaying
render result on a screen.
This is so because of the way renderer updates parts
of the image -- it happens without respect to active
render layer in image user. This is harmless because
only display buffer is modifying, but this is tricky
because we don't have original buffer opened during
rendering.
One more related fix here was about when rendering
multiple layers, wrong image would be displaying when
rendering is done. Added a signal to invalidate
display buffer once rendering is done (only happens
when using multiple layers). This solves issue with
wrong buffer stuck on the display when using regular
CPU display space transform and if GLSL is available
it'll make image displayed with a GLSL shader.
- As an additional change, byte buffers now also uses
GLSL display transform.
So now only dutehr and RGB curves are stoppers for
using GLSL for all kind of display transforms.
2013-04-03 15:59:54 +00:00
|
|
|
void *lock;
|
|
|
|
Image *ima = rj->image;
|
|
|
|
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (ibuf) {
|
Bunch of fixes for GLSL display transform
- GLSL shader wasn't aware of alpha predivide option,
always assuming alpha is straight. Gave wrong results
when displaying transparent float buffers.
- GLSL display wasn't aware of float buffers with number
of channels different from 4, crashing when trying to
display image with different number of channels.
This required a bit larger changes, namely now it's
possible to pass format (GL_RGB, GL_RGBAm GL_LUMINANCE)
to glaDrawPixelsTex, This also implied adding format to
glaDrawPixelsAuto and modifying all places where this
functions are called.
Now GLSL will handle both 3 and 4 channels buffers,
single channel images are handled by CPU.
- Replaced hack for render result displaying with a bit
different hack.
Namely CPU conversion will happen only during render,
once render is done GLSL would be used for displaying
render result on a screen.
This is so because of the way renderer updates parts
of the image -- it happens without respect to active
render layer in image user. This is harmless because
only display buffer is modifying, but this is tricky
because we don't have original buffer opened during
rendering.
One more related fix here was about when rendering
multiple layers, wrong image would be displaying when
rendering is done. Added a signal to invalidate
display buffer once rendering is done (only happens
when using multiple layers). This solves issue with
wrong buffer stuck on the display when using regular
CPU display space transform and if GLSL is available
it'll make image displayed with a GLSL shader.
- As an additional change, byte buffers now also uses
GLSL display transform.
So now only dutehr and RGB curves are stoppers for
using GLSL for all kind of display transforms.
2013-04-03 15:59:54 +00:00
|
|
|
ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Bunch of fixes for GLSL display transform
- GLSL shader wasn't aware of alpha predivide option,
always assuming alpha is straight. Gave wrong results
when displaying transparent float buffers.
- GLSL display wasn't aware of float buffers with number
of channels different from 4, crashing when trying to
display image with different number of channels.
This required a bit larger changes, namely now it's
possible to pass format (GL_RGB, GL_RGBAm GL_LUMINANCE)
to glaDrawPixelsTex, This also implied adding format to
glaDrawPixelsAuto and modifying all places where this
functions are called.
Now GLSL will handle both 3 and 4 channels buffers,
single channel images are handled by CPU.
- Replaced hack for render result displaying with a bit
different hack.
Namely CPU conversion will happen only during render,
once render is done GLSL would be used for displaying
render result on a screen.
This is so because of the way renderer updates parts
of the image -- it happens without respect to active
render layer in image user. This is harmless because
only display buffer is modifying, but this is tricky
because we don't have original buffer opened during
rendering.
One more related fix here was about when rendering
multiple layers, wrong image would be displaying when
rendering is done. Added a signal to invalidate
display buffer once rendering is done (only happens
when using multiple layers). This solves issue with
wrong buffer stuck on the display when using regular
CPU display space transform and if GLSL is available
it'll make image displayed with a GLSL shader.
- As an additional change, byte buffers now also uses
GLSL display transform.
So now only dutehr and RGB curves are stoppers for
using GLSL for all kind of display transforms.
2013-04-03 15:59:54 +00:00
|
|
|
BKE_image_release_ibuf(ima, ibuf, lock);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
/* Finally unlock the user interface (if it was locked). */
|
|
|
|
if (rj->interface_locked) {
|
|
|
|
/* Interface was locked, so window manager couldn't have been changed
|
|
|
|
* and using one from Global will unlock exactly the same manager as
|
|
|
|
* was locked before running the job.
|
|
|
|
*/
|
2018-06-19 19:30:47 +02:00
|
|
|
WM_set_locked_interface(G_MAIN->wm.first, false);
|
|
|
|
DEG_on_visible_update(G_MAIN, false);
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
}
|
2010-04-15 10:28:32 +00:00
|
|
|
}
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* called by render, check job 'stop' value or the global */
|
|
|
|
static int render_breakjob(void *rjv)
|
|
|
|
{
|
2012-03-29 22:42:32 +00:00
|
|
|
RenderJob *rj = rjv;
|
2010-03-08 16:36:53 +00:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (G.is_break) {
|
2010-03-08 16:36:53 +00:00
|
|
|
return 1;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
if (rj->stop && *(rj->stop)) {
|
2010-03-08 16:36:53 +00:00
|
|
|
return 1;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2010-03-08 16:36:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2021-03-18 09:35:12 +11:00
|
|
|
/**
|
|
|
|
* For exec() when there is no render job
|
|
|
|
* note: this wont check for the escape key being pressed, but doing so isn't thread-safe.
|
|
|
|
*/
|
2013-01-22 02:21:21 +00:00
|
|
|
static int render_break(void *UNUSED(rjv))
|
|
|
|
{
|
2019-04-22 09:19:45 +10:00
|
|
|
if (G.is_break) {
|
2013-01-22 02:21:21 +00:00
|
|
|
return 1;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2013-01-22 02:21:21 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-03-25 17:11:32 +00:00
|
|
|
/* runs in thread, no cursor setting here works. careful with notifiers too (malloc conflicts) */
|
2018-09-27 15:35:22 +02:00
|
|
|
/* maybe need a way to get job send notifier? */
|
2021-02-26 16:50:36 +11:00
|
|
|
static void render_drawlock(void *rjv, bool lock)
|
2011-03-25 17:11:32 +00:00
|
|
|
{
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
RenderJob *rj = rjv;
|
|
|
|
|
|
|
|
/* If interface is locked, renderer callback shall do nothing. */
|
|
|
|
if (!rj->interface_locked) {
|
|
|
|
BKE_spacedata_draw_locks(lock);
|
|
|
|
}
|
2011-03-25 17:11:32 +00:00
|
|
|
}
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* catch esc */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int screen_render_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2010-03-08 16:36:53 +00:00
|
|
|
{
|
2012-08-01 19:22:04 +00:00
|
|
|
Scene *scene = (Scene *)op->customdata;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* no running blender, remove handler and pass through */
|
2012-08-15 10:23:06 +00:00
|
|
|
if (0 == WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER)) {
|
2012-03-29 22:42:32 +00:00
|
|
|
return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
|
2010-04-15 10:28:32 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* running render */
|
|
|
|
switch (event->type) {
|
2020-03-18 10:38:37 -06:00
|
|
|
case EVT_ESCKEY:
|
2010-03-08 16:36:53 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
return OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void screen_render_cancel(bContext *C, wmOperator *op)
|
2013-09-23 19:35:21 +00:00
|
|
|
{
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
Scene *scene = (Scene *)op->customdata;
|
|
|
|
|
|
|
|
/* kill on cancel, because job is using op->reports */
|
|
|
|
WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_RENDER);
|
|
|
|
}
|
|
|
|
|
2017-10-16 17:15:03 -02:00
|
|
|
static void clean_viewport_memory_base(Base *base)
|
|
|
|
{
|
2019-10-03 19:22:36 -03:00
|
|
|
if ((base->flag & BASE_VISIBLE_DEPSGRAPH) == 0) {
|
2017-10-16 17:15:03 -02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object = base->object;
|
|
|
|
|
|
|
|
if (object->id.tag & LIB_TAG_DOIT) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
object->id.tag &= ~LIB_TAG_DOIT;
|
|
|
|
if (RE_allow_render_generic_object(object)) {
|
|
|
|
BKE_object_free_derived_caches(object);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-15 14:40:41 +01:00
|
|
|
static void clean_viewport_memory(Main *bmain, Scene *scene)
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
{
|
|
|
|
Scene *sce_iter;
|
2017-02-15 14:40:41 +01:00
|
|
|
Base *base;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-10-16 17:15:03 -02:00
|
|
|
/* Tag all the available objects. */
|
2019-03-08 09:29:17 +11:00
|
|
|
BKE_main_id_tag_listbase(&bmain->objects, LIB_TAG_DOIT, true);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-10-16 17:15:03 -02:00
|
|
|
/* Go over all the visible objects. */
|
|
|
|
for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) {
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
|
2018-07-04 13:00:46 +02:00
|
|
|
ViewLayer *view_layer = WM_window_get_active_view_layer(win);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-11-22 10:52:39 -02:00
|
|
|
for (base = view_layer->object_bases.first; base; base = base->next) {
|
2017-10-16 17:15:03 -02:00
|
|
|
clean_viewport_memory_base(base);
|
|
|
|
}
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
}
|
2017-10-16 17:15:03 -02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-12-04 17:19:34 +11:00
|
|
|
for (SETLOOPER_SET_ONLY(scene, sce_iter, base)) {
|
2017-10-16 17:15:03 -02:00
|
|
|
clean_viewport_memory_base(base);
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* using context, starts job */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2010-03-08 16:36:53 +00:00
|
|
|
{
|
|
|
|
/* new render clears all callbacks */
|
2018-04-24 15:20:17 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2012-03-29 22:42:32 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2018-07-04 13:00:46 +02:00
|
|
|
ViewLayer *active_layer = CTX_data_view_layer(C);
|
|
|
|
ViewLayer *single_layer = NULL;
|
2018-04-17 13:35:05 +02:00
|
|
|
RenderEngineType *re_type = RE_engines_find(scene->r.engine);
|
2010-03-08 16:36:53 +00:00
|
|
|
Render *re;
|
2012-08-15 10:03:29 +00:00
|
|
|
wmJob *wm_job;
|
2010-03-08 16:36:53 +00:00
|
|
|
RenderJob *rj;
|
|
|
|
Image *ima;
|
2013-09-13 13:34:12 +00:00
|
|
|
const bool is_animation = RNA_boolean_get(op->ptr, "animation");
|
|
|
|
const bool is_write_still = RNA_boolean_get(op->ptr, "write_still");
|
|
|
|
const bool use_viewport = RNA_boolean_get(op->ptr, "use_viewport");
|
|
|
|
View3D *v3d = use_viewport ? CTX_wm_view3d(C) : NULL;
|
2012-03-29 22:42:32 +00:00
|
|
|
struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
|
2011-11-03 17:06:12 +00:00
|
|
|
const char *name;
|
2020-04-03 13:25:03 +02:00
|
|
|
ScrArea *area;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-01-29 17:09:38 +01:00
|
|
|
/* Cannot do render if there is not this function. */
|
2018-05-30 14:32:47 +02:00
|
|
|
if (re_type->render == NULL) {
|
2018-01-29 17:09:38 +01:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-24 15:20:17 +02:00
|
|
|
/* custom scene and single layer re-render */
|
2018-07-04 13:00:46 +02:00
|
|
|
screen_render_single_layer_set(op, bmain, active_layer, &scene, &single_layer);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* only one render job at a time */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER)) {
|
2010-03-08 16:36:53 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-24 15:20:17 +02:00
|
|
|
if (!RE_is_rendering_allowed(scene, single_layer, camera_override, op->reports)) {
|
2010-11-03 13:10:09 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_report(
|
|
|
|
op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");
|
2010-11-16 14:40:46 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-05-10 07:50:09 +02:00
|
|
|
/* Reports are done inside check function, and it will return false if there are other strips to
|
|
|
|
* render. */
|
2020-12-19 05:57:27 +01:00
|
|
|
if ((scene->r.scemode & R_DOSEQ) && SEQ_relations_check_scene_recursion(scene, op->reports)) {
|
2020-05-10 07:50:09 +02:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
2012-10-29 17:41:19 +00:00
|
|
|
/* stop all running jobs, except screen one. currently previews frustrate Render */
|
|
|
|
WM_jobs_kill_all_except(CTX_wm_manager(C), CTX_wm_screen(C));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-04-05 07:57:05 +00:00
|
|
|
/* cancel animation playback */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (ED_screen_animation_playing(CTX_wm_manager(C))) {
|
2010-07-19 11:25:23 +00:00
|
|
|
ED_screen_animation_play(C, 0, 0);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* handle UI stuff */
|
2021-03-05 10:36:57 +01:00
|
|
|
WM_cursor_wait(true);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-20 14:11:12 +01:00
|
|
|
/* flush sculpt and editmode changes */
|
2020-01-30 16:46:09 +11:00
|
|
|
ED_editors_flush_edits_ex(bmain, true, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-08-08 16:47:58 +00:00
|
|
|
/* cleanup sequencer caches before starting user triggered render.
|
2012-04-22 11:54:53 +00:00
|
|
|
* otherwise, invalidated cache entries can make their way into
|
2019-05-06 17:36:34 +02:00
|
|
|
* the output rendering. We can't put that into RE_RenderFrame,
|
2012-04-22 11:54:53 +00:00
|
|
|
* since sequence rendering can call that recursively... (peter) */
|
2020-12-19 05:57:27 +01:00
|
|
|
SEQ_cache_cleanup(scene);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* store spare
|
|
|
|
* get view3d layer, local layer, make this nice api call to render
|
|
|
|
* store spare */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* ensure at least 1 area shows result */
|
2020-04-03 13:25:03 +02:00
|
|
|
area = render_view_open(C, event->x, event->y, op->reports);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* job custom data */
|
2012-03-29 22:42:32 +00:00
|
|
|
rj = MEM_callocN(sizeof(RenderJob), "render job");
|
2018-04-24 15:20:17 +02:00
|
|
|
rj->main = bmain;
|
2012-03-29 22:42:32 +00:00
|
|
|
rj->scene = scene;
|
2014-05-02 14:52:19 +02:00
|
|
|
rj->current_scene = rj->scene;
|
2018-04-24 15:20:17 +02:00
|
|
|
rj->single_layer = single_layer;
|
2019-07-25 16:36:22 +02:00
|
|
|
/* TODO(sergey): Render engine should be using own depsgraph.
|
|
|
|
*
|
|
|
|
* NOTE: Currently is only used by ED_update_for_newframe() at the end of the render, so no
|
|
|
|
* need to ensure evaluation here. */
|
|
|
|
rj->depsgraph = CTX_data_depsgraph_pointer(C);
|
2011-04-30 04:29:36 +00:00
|
|
|
rj->camera_override = camera_override;
|
2012-03-29 22:42:32 +00:00
|
|
|
rj->anim = is_animation;
|
|
|
|
rj->write_still = is_write_still && !is_animation;
|
|
|
|
rj->iuser.scene = scene;
|
|
|
|
rj->iuser.ok = 1;
|
|
|
|
rj->reports = op->reports;
|
2013-12-17 23:42:38 +06:00
|
|
|
rj->orig_layer = 0;
|
|
|
|
rj->last_layer = 0;
|
2020-04-03 13:25:03 +02:00
|
|
|
rj->area = area;
|
2017-05-08 17:43:32 +02:00
|
|
|
rj->supports_glsl_draw = IMB_colormanagement_support_glsl_draw(&scene->view_settings);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-01-01 16:59:38 +06:00
|
|
|
BKE_color_managed_display_settings_copy(&rj->display_settings, &scene->display_settings);
|
|
|
|
BKE_color_managed_view_settings_copy(&rj->view_settings, &scene->view_settings);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 13:25:03 +02:00
|
|
|
if (area) {
|
|
|
|
SpaceImage *sima = area->spacedata.first;
|
2013-12-17 23:42:38 +06:00
|
|
|
rj->orig_layer = sima->iuser.layer;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-12-01 07:58:27 +00:00
|
|
|
if (v3d) {
|
2019-04-22 09:19:45 +10:00
|
|
|
if (camera_override && camera_override != scene->camera) {
|
2013-07-12 16:33:30 +00:00
|
|
|
rj->v3d_override = true;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2012-11-29 19:04:33 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
/* Lock the user interface depending on render settings. */
|
|
|
|
if (scene->r.use_lock_interface) {
|
|
|
|
WM_set_locked_interface(CTX_wm_manager(C), true);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
/* Set flag interface need to be unlocked.
|
|
|
|
*
|
|
|
|
* This is so because we don't have copy of render settings
|
|
|
|
* accessible from render job and copy is needed in case
|
|
|
|
* of non-locked rendering, so we wouldn't try to unlock
|
|
|
|
* anything if option was initially unset but then was
|
|
|
|
* enabled during rendering.
|
|
|
|
*/
|
|
|
|
rj->interface_locked = true;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
/* Clean memory used by viewport? */
|
2017-02-15 14:40:41 +01:00
|
|
|
clean_viewport_memory(rj->main, scene);
|
Option to lock the interface while rendering
Added function called WM_set_locked_interface which does
two things:
- Prevents event queue from being handled, so no operators
(see below) or values are even possible to run or change.
This prevents any kind of "destructive" action performed
from user while rendering.
- Locks interface refresh for regions which does have lock
set to truth in their template. Currently it's just a 3D
viewport, but in the future more regions could be considered
unsafe, or we could want to lock different parts of
interface when doing different jobs.
This is needed because 3D viewport could be using or changing
the same data as renderer currently uses, leading to threading
conflict.
Notifiers are still allowed to handle, so render progress is
seen on the screen, but would need to doublecheck on this, in
terms some notifiers could be changing the data.
For now interface locking happens for render job only in case
"Lock Interface" checkbox is enabled.
Other tools like backing would also benefit of this option.
It is possible to mark operator as safe to be used in locked
interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
template flags.
This bit is completely handled by wm_evem_system, not
with operator run routines, so it's still possible to
run operators from drivers and handlers.
Currently allowed image editor navigation and zooming.
Reviewers: brecht, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D142
2014-01-29 16:07:14 +06:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* setup job */
|
2019-04-22 09:19:45 +10:00
|
|
|
if (RE_seq_render_active(scene, &scene->r)) {
|
2012-03-29 22:42:32 +00:00
|
|
|
name = "Sequence Render";
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
else {
|
2012-03-29 22:42:32 +00:00
|
|
|
name = "Render";
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-07-01 15:23:42 +02:00
|
|
|
wm_job = WM_jobs_get(CTX_wm_manager(C),
|
|
|
|
CTX_wm_window(C),
|
|
|
|
scene,
|
|
|
|
name,
|
|
|
|
WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS,
|
|
|
|
WM_JOB_TYPE_RENDER);
|
2012-08-15 10:03:29 +00:00
|
|
|
WM_jobs_customdata_set(wm_job, rj, render_freejob);
|
|
|
|
WM_jobs_timer(wm_job, 0.2, NC_SCENE | ND_RENDER_RESULT, 0);
|
|
|
|
WM_jobs_callbacks(wm_job, render_startjob, NULL, NULL, render_endjob);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-07-01 15:23:42 +02:00
|
|
|
if (RNA_struct_property_is_set(op->ptr, "layer")) {
|
|
|
|
WM_jobs_delay_start(wm_job, 0.2);
|
|
|
|
}
|
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* get a render result image, and make sure it is empty */
|
2020-03-06 13:02:59 +11:00
|
|
|
ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
|
2018-06-11 15:40:37 +02:00
|
|
|
BKE_image_signal(rj->main, ima, NULL, IMA_SIGNAL_FREE);
|
2015-11-30 00:51:30 +01:00
|
|
|
BKE_image_backup_render(rj->scene, ima, true);
|
2012-03-29 22:42:32 +00:00
|
|
|
rj->image = ima;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* setup new render */
|
2017-09-12 11:27:22 +05:00
|
|
|
re = RE_NewSceneRender(scene);
|
2010-03-08 16:36:53 +00:00
|
|
|
RE_test_break_cb(re, rj, render_breakjob);
|
2011-03-25 17:11:32 +00:00
|
|
|
RE_draw_lock_cb(re, rj, render_drawlock);
|
2013-12-17 23:42:38 +06:00
|
|
|
RE_display_update_cb(re, rj, image_rect_update);
|
2014-05-02 14:52:19 +02:00
|
|
|
RE_current_scene_update_cb(re, rj, current_scene_update);
|
2010-03-08 16:36:53 +00:00
|
|
|
RE_stats_draw_cb(re, rj, image_renderinfo_cb);
|
2010-05-27 08:22:16 +00:00
|
|
|
RE_progress_cb(re, rj, render_progress_update);
|
2018-06-11 13:54:31 +02:00
|
|
|
RE_gl_context_create(re);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-29 22:42:32 +00:00
|
|
|
rj->re = re;
|
2014-04-01 11:34:00 +11:00
|
|
|
G.is_break = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-08-01 19:22:04 +00:00
|
|
|
/* store actual owner of job, so modal operator could check for it,
|
|
|
|
* the reason of this is that active scene could change when rendering
|
2020-09-30 20:09:02 +10:00
|
|
|
* several layers from compositor T31800. */
|
2012-08-01 19:22:04 +00:00
|
|
|
op->customdata = scene;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-08-15 10:03:29 +00:00
|
|
|
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-03-05 10:36:57 +01:00
|
|
|
WM_cursor_wait(false);
|
2012-03-29 22:42:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-08-08 18:37:06 +00:00
|
|
|
/* we set G.is_rendering here already instead of only in the job, this ensure
|
2012-03-03 16:31:46 +00:00
|
|
|
* main loop or other scene updates are disabled in time, since they may
|
|
|
|
* have started before the job thread */
|
2014-04-01 11:34:00 +11:00
|
|
|
G.is_rendering = true;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* add modal handler for ESC */
|
|
|
|
WM_event_add_modal_handler(C, op);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* contextual render, using current scene, view3d? */
|
|
|
|
void RENDER_OT_render(wmOperatorType *ot)
|
|
|
|
{
|
2012-11-29 19:04:33 +00:00
|
|
|
PropertyRNA *prop;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Render";
|
|
|
|
ot->description = "Render active scene";
|
|
|
|
ot->idname = "RENDER_OT_render";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-08 16:36:53 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = screen_render_invoke;
|
|
|
|
ot->modal = screen_render_modal;
|
2013-09-23 19:35:21 +00:00
|
|
|
ot->cancel = screen_render_cancel;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = screen_render_exec;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-02-05 16:23:34 +11:00
|
|
|
/* This isn't needed, causes failure in background mode. */
|
2019-04-29 19:29:41 +10:00
|
|
|
#if 0
|
|
|
|
ot->poll = ED_operator_screenactive;
|
|
|
|
#endif
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-10-29 02:09:57 +13:00
|
|
|
prop = RNA_def_boolean(ot->srna,
|
|
|
|
"animation",
|
|
|
|
0,
|
|
|
|
"Animation",
|
|
|
|
"Render files from the animation range of this scene");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2010-11-16 14:40:46 +00:00
|
|
|
RNA_def_boolean(
|
|
|
|
ot->srna,
|
|
|
|
"write_still",
|
|
|
|
0,
|
|
|
|
"Write Image",
|
|
|
|
"Save rendered the image to the output path (used only when animation is disabled)");
|
2017-10-29 02:09:57 +13:00
|
|
|
prop = RNA_def_boolean(ot->srna,
|
|
|
|
"use_viewport",
|
|
|
|
0,
|
|
|
|
"Use 3D Viewport",
|
|
|
|
"When inside a 3D viewport, use layers and camera of the viewport");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2014-01-16 21:43:22 +11:00
|
|
|
prop = RNA_def_string(ot->srna,
|
|
|
|
"layer",
|
|
|
|
NULL,
|
|
|
|
RE_MAXNAME,
|
|
|
|
"Render Layer",
|
|
|
|
"Single render layer to re-render (used only when animation is disabled)");
|
2012-11-29 19:04:33 +00:00
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2014-01-16 21:43:22 +11:00
|
|
|
prop = RNA_def_string(ot->srna,
|
|
|
|
"scene",
|
|
|
|
NULL,
|
|
|
|
MAX_ID_NAME - 2,
|
|
|
|
"Scene",
|
|
|
|
"Scene to render, current scene if not specified");
|
2012-11-29 19:04:33 +00:00
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2010-03-08 16:36:53 +00:00
|
|
|
}
|
|
|
|
|
2013-10-31 17:20:31 +00:00
|
|
|
Scene *ED_render_job_get_scene(const bContext *C)
|
|
|
|
{
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
RenderJob *rj = (RenderJob *)WM_jobs_customdata_from_type(wm, WM_JOB_TYPE_RENDER);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (rj) {
|
2015-03-11 00:01:53 +05:00
|
|
|
return rj->scene;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-10-31 17:20:31 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2015-03-11 00:01:53 +05:00
|
|
|
|
|
|
|
Scene *ED_render_job_get_current_scene(const bContext *C)
|
|
|
|
{
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
RenderJob *rj = (RenderJob *)WM_jobs_customdata_from_type(wm, WM_JOB_TYPE_RENDER);
|
|
|
|
if (rj) {
|
|
|
|
return rj->current_scene;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-10-27 19:00:51 +05:00
|
|
|
|
|
|
|
/* Motion blur curve preset */
|
|
|
|
|
|
|
|
static int render_shutter_curve_preset_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
CurveMapping *mblur_shutter_curve = &scene->r.mblur_shutter_curve;
|
|
|
|
CurveMap *cm = mblur_shutter_curve->cm;
|
|
|
|
int preset = RNA_enum_get(op->ptr, "shape");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-11-01 12:09:55 +01:00
|
|
|
mblur_shutter_curve->flag &= ~CUMA_EXTEND_EXTRAPOLATE;
|
2015-10-27 19:00:51 +05:00
|
|
|
mblur_shutter_curve->preset = preset;
|
2019-08-07 03:21:55 +10:00
|
|
|
BKE_curvemap_reset(
|
2015-10-27 19:00:51 +05:00
|
|
|
cm, &mblur_shutter_curve->clipr, mblur_shutter_curve->preset, CURVEMAP_SLOPE_POS_NEG);
|
2019-08-07 03:21:55 +10:00
|
|
|
BKE_curvemapping_changed(mblur_shutter_curve, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-10-27 19:00:51 +05:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void RENDER_OT_shutter_curve_preset(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
PropertyRNA *prop;
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem prop_shape_items[] = {
|
2015-10-27 19:00:51 +05:00
|
|
|
{CURVE_PRESET_SHARP, "SHARP", 0, "Sharp", ""},
|
|
|
|
{CURVE_PRESET_SMOOTH, "SMOOTH", 0, "Smooth", ""},
|
|
|
|
{CURVE_PRESET_MAX, "MAX", 0, "Max", ""},
|
|
|
|
{CURVE_PRESET_LINE, "LINE", 0, "Line", ""},
|
|
|
|
{CURVE_PRESET_ROUND, "ROUND", 0, "Round", ""},
|
|
|
|
{CURVE_PRESET_ROOT, "ROOT", 0, "Root", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
|
|
|
};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-10-27 19:00:51 +05:00
|
|
|
ot->name = "Shutter Curve Preset";
|
|
|
|
ot->description = "Set shutter curve";
|
|
|
|
ot->idname = "RENDER_OT_shutter_curve_preset";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-10-27 19:00:51 +05:00
|
|
|
ot->exec = render_shutter_curve_preset_exec;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-10-27 19:00:51 +05:00
|
|
|
prop = RNA_def_enum(ot->srna, "shape", prop_shape_items, CURVE_PRESET_SMOOTH, "Mode", "");
|
|
|
|
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE); /* Abusing id_curve :/ */
|
|
|
|
}
|