diff options
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_intern.h | 9 | ||||
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 771 | ||||
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 145 | ||||
| -rw-r--r-- | source/blender/editors/render/render_ops.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 292 | ||||
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 412 | ||||
| -rw-r--r-- | source/blender/editors/render/render_update.c | 365 | ||||
| -rw-r--r-- | source/blender/editors/render/render_view.c | 15 |
9 files changed, 478 insertions, 1540 deletions
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index ec8bf3e955d..ed2e9747d1c 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -24,6 +24,8 @@ set(INC ../../blenlib ../../blenloader ../../blentranslation + ../../depsgraph + ../../draw ../../gpu ../../imbuf ../../bmesh diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h index a00ab742386..77bf16f5e22 100644 --- a/source/blender/editors/render/render_intern.h +++ b/source/blender/editors/render/render_intern.h @@ -53,8 +53,8 @@ void WORLD_OT_new(struct wmOperatorType *ot); void MATERIAL_OT_copy(struct wmOperatorType *ot); void MATERIAL_OT_paste(struct wmOperatorType *ot); -void SCENE_OT_render_layer_add(struct wmOperatorType *ot); -void SCENE_OT_render_layer_remove(struct wmOperatorType *ot); +void SCENE_OT_view_layer_add(struct wmOperatorType *ot); +void SCENE_OT_view_layer_remove(struct wmOperatorType *ot); void SCENE_OT_render_view_add(struct wmOperatorType *ot); void SCENE_OT_render_view_remove(struct wmOperatorType *ot); @@ -83,15 +83,10 @@ void SCENE_OT_freestyle_stroke_material_create(struct wmOperatorType *ot); void TEXTURE_OT_slot_copy(struct wmOperatorType *ot); void TEXTURE_OT_slot_paste(struct wmOperatorType *ot); void TEXTURE_OT_slot_move(struct wmOperatorType *ot); -void TEXTURE_OT_envmap_save(struct wmOperatorType *ot); -void TEXTURE_OT_envmap_clear(struct wmOperatorType *ot); -void TEXTURE_OT_envmap_clear_all(struct wmOperatorType *ot); /* render_internal.c */ void RENDER_OT_render(struct wmOperatorType *ot); void RENDER_OT_shutter_curve_preset(struct wmOperatorType *ot); -void render_view3d_update(struct RenderEngine *engine, const struct bContext *C); -void render_view3d_draw(struct RenderEngine *engine, const struct bContext *C); /* render_view.c */ struct ScrArea *render_view_open(struct bContext *C, int mx, int my, struct ReportList *reports); diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 59538df7a05..1385baa51ad 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -54,9 +54,9 @@ #include "BKE_camera.h" #include "BKE_context.h" #include "BKE_colortools.h" -#include "BKE_depsgraph.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" @@ -66,6 +66,9 @@ #include "BKE_screen.h" #include "BKE_scene.h" #include "BKE_undo_system.h" +#include "BKE_workspace.h" + +#include "DEG_depsgraph.h" #include "WM_api.h" #include "WM_types.h" @@ -83,6 +86,7 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" +#include "GPU_shader.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -100,9 +104,13 @@ static int render_break(void *rjv); typedef struct RenderJob { Main *main; Scene *scene; + ViewLayer *single_layer; Scene *current_scene; + /* TODO(sergey): Should not be needed once engine will have own + * depsgraph and copy-on-write will be implemented. + */ + Depsgraph *depsgraph; Render *re; - SceneRenderLayer *srl; struct Object *camera_override; int lay_override; bool v3d_override; @@ -255,7 +263,7 @@ static void image_buffer_rect_update(RenderJob *rj, RenderResult *rr, ImBuf *ibu /* set callbacks, exported to sequence render too. * Only call in foreground (UI) renders. */ -static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **scene, SceneRenderLayer **srl) +static void screen_render_single_layer_set(wmOperator *op, Main *mainp, WorkSpace *workspace, Scene **scene, ViewLayer **single_layer) { /* single layer re-render */ if (RNA_struct_property_is_set(op->ptr, "scene")) { @@ -275,14 +283,17 @@ static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **s } if (RNA_struct_property_is_set(op->ptr, "layer")) { - SceneRenderLayer *rl; + ViewLayer *rl; char rl_name[RE_MAXNAME]; RNA_string_get(op->ptr, "layer", rl_name); - rl = (SceneRenderLayer *)BLI_findstring(&(*scene)->r.layers, rl_name, offsetof(SceneRenderLayer, name)); + rl = (ViewLayer *)BLI_findstring(&(*scene)->view_layers, rl_name, offsetof(ViewLayer, name)); if (rl) - *srl = rl; + *single_layer = rl; + } + else if (((*scene)->r.scemode & R_SINGLE_LAYER) && workspace) { + *single_layer = BKE_view_layer_from_workspace_get(*scene, workspace); } } @@ -290,18 +301,25 @@ static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **s static int screen_render_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = NULL; + RenderEngineType *re_type = RE_engines_find(scene->r.engine); + ViewLayer *single_layer = NULL; Render *re; Image *ima; View3D *v3d = CTX_wm_view3d(C); Main *mainp = CTX_data_main(C); + WorkSpace *workspace = CTX_wm_workspace(C); unsigned int lay_override; const bool is_animation = RNA_boolean_get(op->ptr, "animation"); const bool is_write_still = RNA_boolean_get(op->ptr, "write_still"); struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; + /* Cannot do render if there is not this function. */ + if (re_type->render == NULL) { + return OPERATOR_CANCELLED; + } + /* custom scene and single layer re-render */ - screen_render_scene_layer_set(op, mainp, &scene, &srl); + screen_render_single_layer_set(op, mainp, workspace, &scene, &single_layer); if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) { BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected"); @@ -330,13 +348,13 @@ static int screen_render_exec(bContext *C, wmOperator *op) if (is_animation) RE_BlenderAnim(re, mainp, scene, camera_override, lay_override, scene->r.sfra, scene->r.efra, scene->r.frame_step); else - RE_BlenderFrame(re, mainp, scene, srl, camera_override, lay_override, scene->r.cfra, is_write_still); + RE_BlenderFrame(re, mainp, scene, single_layer, camera_override, lay_override, scene->r.cfra, is_write_still); BLI_threaded_malloc_end(); RE_SetReports(re, NULL); // no redraw needed, we leave state as we entered it - ED_update_for_newframe(mainp, scene, 1); + ED_update_for_newframe(mainp, CTX_data_depsgraph(C)); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene); @@ -492,8 +510,9 @@ static void render_image_update_pass_and_layer(RenderJob *rj, RenderResult *rr, for (wm = rj->main->wm.first; wm && matched_sa == NULL; wm = wm->id.next) { /* only 1 wm */ wmWindow *win; for (win = wm->windows.first; win && matched_sa == NULL; win = win->next) { - ScrArea *sa; - for (sa = win->screen->areabase.first; sa; sa = sa->next) { + const bScreen *screen = WM_window_get_active_screen(win); + + for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { if (sa->spacetype == SPACE_IMAGE) { SpaceImage *sima = sa->spacedata.first; // sa->spacedata might be empty when toggling fullscreen mode. @@ -604,7 +623,7 @@ static void render_startjob(void *rjv, short *stop, short *do_update, float *pro if (rj->anim) RE_BlenderAnim(rj->re, rj->main, rj->scene, rj->camera_override, rj->lay_override, rj->scene->r.sfra, rj->scene->r.efra, rj->scene->r.frame_step); else - RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->srl, rj->camera_override, rj->lay_override, rj->scene->r.cfra, rj->write_still); + RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->single_layer, rj->camera_override, rj->lay_override, rj->scene->r.cfra, rj->write_still); RE_SetReports(rj->re, NULL); } @@ -617,8 +636,9 @@ static void render_image_restore_layer(RenderJob *rj) 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) { - ScrArea *sa; - for (sa = win->screen->areabase.first; sa; sa = sa->next) { + const bScreen *screen = WM_window_get_active_screen(win); + + for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { if (sa == rj->sa) { if (sa->spacetype == SPACE_IMAGE) { SpaceImage *sima = sa->spacedata.first; @@ -653,14 +673,14 @@ static void render_endjob(void *rjv) * would be re-assigned. assign dummy callbacks to avoid referencing freed renderjobs bug [#24508] */ RE_InitRenderCB(rj->re); - if (rj->main != G.main) + if (rj->main != G_MAIN) BKE_main_free(rj->main); /* else the frame will not update for the original value */ if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) { /* possible this fails of loading new file while rendering */ - if (G.main->wm.first) { - ED_update_for_newframe(G.main, rj->scene, 1); + if (G_MAIN->wm.first) { + ED_update_for_newframe(G_MAIN, rj->depsgraph); } } @@ -670,7 +690,7 @@ static void render_endjob(void *rjv) /* potentially set by caller */ rj->scene->r.scemode &= ~R_NO_FRAME_UPDATE; - if (rj->srl) { + if (rj->single_layer) { nodeUpdateID(rj->scene->nodetree, &rj->scene->id); WM_main_add_notifier(NC_NODE | NA_EDITED, rj->scene); } @@ -700,7 +720,7 @@ static void render_endjob(void *rjv) * engine API, so lets use simple and robust way for now * - sergey - */ - if (rj->scene->r.layers.first != rj->scene->r.layers.last || + if (rj->scene->view_layers.first != rj->scene->view_layers.last || rj->image_outdated) { void *lock; @@ -721,7 +741,7 @@ static void render_endjob(void *rjv) * and using one from Global will unlock exactly the same manager as * was locked before running the job. */ - WM_set_locked_interface(G.main->wm.first, false); + WM_set_locked_interface(G_MAIN->wm.first, false); /* We've freed all the derived caches before rendering, which is * effectively the same as if we re-loaded the file. @@ -729,11 +749,11 @@ static void render_endjob(void *rjv) * So let's not try being smart here and just reset all updated * scene layers and use generic DAG_on_visible_update. */ - for (scene = G.main->scene.first; scene; scene = scene->id.next) { + for (scene = G_MAIN->scene.first; scene; scene = scene->id.next) { scene->lay_updated = 0; } - DAG_on_visible_update(G.main, false); + DEG_on_visible_update(G_MAIN, false); } } @@ -797,33 +817,46 @@ static void screen_render_cancel(bContext *C, wmOperator *op) WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_RENDER); } -static void clean_viewport_memory(Main *bmain, Scene *scene, int renderlay) +static void clean_viewport_memory_base(Base *base) { - Object *object; - Scene *sce_iter; - Base *base; + if ((base->flag & BASE_VISIBLE) == 0) { + return; + } + + Object *object = base->object; - for (object = bmain->object.first; object; object = object->id.next) { - object->id.tag |= LIB_TAG_DOIT; + if (object->id.tag & LIB_TAG_DOIT) { + return; } - for (SETLOOPER(scene, sce_iter, base)) { - if ((base->lay & renderlay) == 0) { - continue; - } - if (RE_allow_render_generic_object(base->object)) { - base->object->id.tag &= ~LIB_TAG_DOIT; - } + object->id.tag &= ~LIB_TAG_DOIT; + if (RE_allow_render_generic_object(object)) { + BKE_object_free_derived_caches(object); } +} + +static void clean_viewport_memory(Main *bmain, Scene *scene) +{ + Scene *sce_iter; + Base *base; - for (SETLOOPER(scene, sce_iter, base)) { - object = base->object; - if ((object->id.tag & LIB_TAG_DOIT) == 0) { - continue; + /* Tag all the available objects. */ + BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); + + /* Go over all the visible objects. */ + for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) { + for (wmWindow *win = wm->windows.first; win; win = win->next) { + WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook); + ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace); + + for (base = view_layer->object_bases.first; base; base = base->next) { + clean_viewport_memory_base(base); + } } - object->id.tag &= ~LIB_TAG_DOIT; + } - BKE_object_free_derived_caches(object); + for (SETLOOPER_SET_ONLY(scene, sce_iter, base)) { + clean_viewport_memory_base(base); } } @@ -831,9 +864,10 @@ static void clean_viewport_memory(Main *bmain, Scene *scene, int renderlay) static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *event) { /* new render clears all callbacks */ - Main *mainp; + Main *bmain = CTX_data_main(C); + ViewLayer *single_layer = NULL; Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = NULL; + RenderEngineType *re_type = RE_engines_find(scene->r.engine); Render *re; wmJob *wm_job; RenderJob *rj; @@ -843,18 +877,24 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even 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; + WorkSpace *workspace = CTX_wm_workspace(C); struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; const char *name; ScrArea *sa; + /* Cannot do render if there is not this function. */ + if (re_type->render == NULL) { + return OPERATOR_CANCELLED; + } + + /* custom scene and single layer re-render */ + screen_render_single_layer_set(op, bmain, workspace, &scene, &single_layer); + /* only one render job at a time */ if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER)) return OPERATOR_CANCELLED; - if (RE_force_single_renderlayer(scene)) - WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, NULL); - - if (!RE_is_rendering_allowed(scene, camera_override, op->reports)) { + if (!RE_is_rendering_allowed(scene, single_layer, camera_override, op->reports)) { return OPERATOR_CANCELLED; } @@ -866,15 +906,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even /* stop all running jobs, except screen one. currently previews frustrate Render */ WM_jobs_kill_all_except(CTX_wm_manager(C), CTX_wm_screen(C)); - /* get main */ - if (G.debug_value == 101) { - /* thread-safety experiment, copy main from the undo buffer */ - struct MemFile *memfile = ED_undosys_stack_memfile_get_active(CTX_wm_manager(C)->undo_stack); - mainp = BLO_memfile_main_get(memfile, CTX_data_main(C), &scene); - } - else - mainp = CTX_data_main(C); - /* cancel animation playback */ if (ED_screen_animation_playing(CTX_wm_manager(C))) ED_screen_animation_play(C, 0, 0); @@ -900,18 +931,17 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even jobflag = WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS; - /* custom scene and single layer re-render */ - screen_render_scene_layer_set(op, mainp, &scene, &srl); - if (RNA_struct_property_is_set(op->ptr, "layer")) jobflag |= WM_JOB_SUSPEND; /* job custom data */ rj = MEM_callocN(sizeof(RenderJob), "render job"); - rj->main = mainp; + rj->main = bmain; rj->scene = scene; rj->current_scene = rj->scene; - rj->srl = srl; + rj->single_layer = single_layer; + /* TODO(sergey): Render engine should be using own depsgraph. */ + rj->depsgraph = CTX_data_depsgraph(C); rj->camera_override = camera_override; rj->lay_override = 0; rj->anim = is_animation; @@ -946,8 +976,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even /* Lock the user interface depending on render settings. */ if (scene->r.use_lock_interface) { - int renderlay = rj->lay_override ? rj->lay_override : scene->lay; - WM_set_locked_interface(CTX_wm_manager(C), true); /* Set flag interface need to be unlocked. @@ -961,7 +989,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even rj->interface_locked = true; /* Clean memory used by viewport? */ - clean_viewport_memory(rj->main, scene, renderlay); + clean_viewport_memory(rj->main, scene); } /* setup job */ @@ -974,7 +1002,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even WM_jobs_callbacks(wm_job, render_startjob, NULL, NULL, render_endjob); /* get a render result image, and make sure it is empty */ - ima = BKE_image_verify_viewer(mainp, IMA_TYPE_R_RESULT, "Render Result"); + ima = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result"); BKE_image_signal(rj->main, ima, NULL, IMA_SIGNAL_FREE); BKE_image_backup_render(rj->scene, ima, true); rj->image = ima; @@ -987,6 +1015,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even RE_current_scene_update_cb(re, rj, current_scene_update); RE_stats_draw_cb(re, rj, image_renderinfo_cb); RE_progress_cb(re, rj, render_progress_update); + RE_gl_context_create(re); rj->re = re; G.is_break = false; @@ -1043,615 +1072,6 @@ void RENDER_OT_render(wmOperatorType *ot) } -/* ************** preview for 3d viewport ***************** */ - -#define PR_UPDATE_VIEW 1 -#define PR_UPDATE_RENDERSIZE 2 -#define PR_UPDATE_MATERIAL 4 -#define PR_UPDATE_DATABASE 8 - -typedef struct RenderPreview { - /* from wmJob */ - void *owner; - short *stop, *do_update; - wmJob *job; - - Scene *scene; - ScrArea *sa; - ARegion *ar; - View3D *v3d; - RegionView3D *rv3d; - Main *bmain; - RenderEngine *engine; - - float viewmat[4][4]; - - int start_resolution_divider; - int resolution_divider; - bool has_freestyle; -} RenderPreview; - -static int render_view3d_disprect(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, rcti *disprect) -{ - /* copied code from view3d_draw.c */ - rctf viewborder; - int draw_border; - - if (rv3d->persp == RV3D_CAMOB) - draw_border = (scene->r.mode & R_BORDER) != 0; - else - draw_border = (v3d->flag2 & V3D_RENDER_BORDER) != 0; - - if (draw_border) { - if (rv3d->persp == RV3D_CAMOB) { - ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewborder, false); - - disprect->xmin = viewborder.xmin + scene->r.border.xmin * BLI_rctf_size_x(&viewborder); - disprect->ymin = viewborder.ymin + scene->r.border.ymin * BLI_rctf_size_y(&viewborder); - disprect->xmax = viewborder.xmin + scene->r.border.xmax * BLI_rctf_size_x(&viewborder); - disprect->ymax = viewborder.ymin + scene->r.border.ymax * BLI_rctf_size_y(&viewborder); - } - else { - disprect->xmin = v3d->render_border.xmin * ar->winx; - disprect->xmax = v3d->render_border.xmax * ar->winx; - disprect->ymin = v3d->render_border.ymin * ar->winy; - disprect->ymax = v3d->render_border.ymax * ar->winy; - } - - return 1; - } - - BLI_rcti_init(disprect, 0, 0, 0, 0); - return 0; -} - -/* returns true if OK */ -static bool render_view3d_get_rects(ARegion *ar, View3D *v3d, RegionView3D *rv3d, rctf *viewplane, RenderEngine *engine, - float *r_clipsta, float *r_clipend, float *r_pixsize, bool *r_ortho) -{ - - if (ar->winx < 4 || ar->winy < 4) return false; - - *r_ortho = ED_view3d_viewplane_get(v3d, rv3d, ar->winx, ar->winy, viewplane, r_clipsta, r_clipend, r_pixsize); - - engine->resolution_x = ar->winx; - engine->resolution_y = ar->winy; - - return true; -} - -static bool render_view3d_is_valid(RenderPreview *rp) -{ - return (rp->rv3d->render_engine != NULL); -} - -/* called by renderer, checks job value */ -static int render_view3d_break(void *rpv) -{ - RenderPreview *rp = rpv; - - if (G.is_break) - return 1; - - /* during render, rv3d->engine can get freed */ - if (render_view3d_is_valid(rp) == false) { - *rp->stop = 1; - } - - return *(rp->stop); -} - -static void render_view3d_display_update(void *rpv, RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect)) -{ - RenderPreview *rp = rpv; - - *(rp->do_update) = true; -} - -static void render_view3d_renderinfo_cb(void *rjp, RenderStats *rs) -{ - RenderPreview *rp = rjp; - - /* during render, rv3d->engine can get freed */ - if (rp->rv3d->render_engine == NULL) { - *rp->stop = 1; - } - else { - make_renderinfo_string(rs, rp->scene, false, NULL, rp->engine->text); - - /* make jobs timer to send notifier */ - *(rp->do_update) = true; - } -} - -BLI_INLINE void rcti_scale_coords(rcti *scaled_rect, const rcti *rect, - const float scale) -{ - scaled_rect->xmin = rect->xmin * scale; - scaled_rect->ymin = rect->ymin * scale; - scaled_rect->xmax = rect->xmax * scale; - scaled_rect->ymax = rect->ymax * scale; -} - -static void render_update_resolution(Render *re, const RenderPreview *rp, - bool use_border, const rcti *clip_rect) -{ - int winx = rp->ar->winx / rp->resolution_divider; - int winy = rp->ar->winy / rp->resolution_divider; - if (use_border) { - rcti scaled_cliprct; - rcti_scale_coords(&scaled_cliprct, clip_rect, - 1.0f / rp->resolution_divider); - RE_ChangeResolution(re, winx, winy, &scaled_cliprct); - } - else { - RE_ChangeResolution(re, winx, winy, NULL); - } - - if (rp->has_freestyle) { - if (rp->resolution_divider == BKE_render_preview_pixel_size(&rp->scene->r)) { - RE_ChangeModeFlag(re, R_EDGE_FRS, false); - } - else { - RE_ChangeModeFlag(re, R_EDGE_FRS, true); - } - } -} - -static void render_view3d_startjob(void *customdata, short *stop, short *do_update, float *UNUSED(progress)) -{ - RenderPreview *rp = customdata; - Render *re; - RenderStats *rstats; - rctf viewplane; - rcti cliprct; - float clipsta, clipend, pixsize; - bool orth, restore = 0; - char name[32]; - int update_flag; - bool use_border; - int ob_inst_update_flag = 0; - - update_flag = rp->engine->job_update_flag; - rp->engine->job_update_flag = 0; - - //printf("ma %d res %d view %d db %d\n", update_flag & PR_UPDATE_MATERIAL, update_flag & PR_UPDATE_RENDERSIZE, update_flag & PR_UPDATE_VIEW, update_flag & PR_UPDATE_DATABASE); - - G.is_break = false; - - if (false == render_view3d_get_rects(rp->ar, rp->v3d, rp->rv3d, &viewplane, rp->engine, &clipsta, &clipend, &pixsize, &orth)) - return; - - rp->stop = stop; - rp->do_update = do_update; - - // printf("Enter previewrender\n"); - - /* ok, are we rendering all over? */ - sprintf(name, "View3dPreview %p", (void *)rp->ar); - re = rp->engine->re = RE_GetRender(name); - - /* set this always, rp is different for each job */ - RE_test_break_cb(re, rp, render_view3d_break); - RE_display_update_cb(re, rp, render_view3d_display_update); - RE_stats_draw_cb(re, rp, render_view3d_renderinfo_cb); - - rstats = RE_GetStats(re); - - if (update_flag & PR_UPDATE_VIEW) { - Object *object; - rp->resolution_divider = rp->start_resolution_divider; - - /* Same as database_init_objects(), loop over all objects. - * We might consider de-duplicating the code between this two cases. - */ - for (object = rp->bmain->object.first; object; object = object->id.next) { - float mat[4][4]; - mul_m4_m4m4(mat, rp->viewmat, object->obmat); - invert_m4_m4(object->imat_ren, mat); - } - } - - use_border = render_view3d_disprect(rp->scene, rp->ar, rp->v3d, - rp->rv3d, &cliprct); - - if ((update_flag & (PR_UPDATE_RENDERSIZE | PR_UPDATE_DATABASE | PR_UPDATE_VIEW)) || rstats->convertdone == 0) { - RenderData rdata; - - /* no osa, blur, seq, layers, savebuffer etc for preview render */ - rdata = rp->scene->r; - rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA); - rdata.scemode &= ~(R_DOSEQ | R_DOCOMP | R_FREE_IMAGE | R_EXR_TILE_FILE | R_FULL_SAMPLE); - rdata.scemode |= R_VIEWPORT_PREVIEW; - - /* we do use layers, but only active */ - rdata.scemode |= R_SINGLE_LAYER; - - /* initalize always */ - if (use_border) { - rdata.mode |= R_BORDER; - RE_InitState(re, NULL, &rdata, NULL, rp->ar->winx, rp->ar->winy, &cliprct); - } - else - RE_InitState(re, NULL, &rdata, NULL, rp->ar->winx, rp->ar->winy, NULL); - } - - if (orth) - RE_SetOrtho(re, &viewplane, clipsta, clipend); - else - RE_SetWindow(re, &viewplane, clipsta, clipend); - - RE_SetPixelSize(re, pixsize); - - if ((update_flag & PR_UPDATE_DATABASE) || rstats->convertdone == 0) { - unsigned int lay = rp->scene->lay; - - /* allow localview render for objects with lights in normal layers */ - if (rp->v3d->lay & 0xFF000000) - lay |= rp->v3d->lay; - else lay = rp->v3d->lay; - - RE_SetView(re, rp->viewmat); - - /* copying blender data while main thread is locked, to avoid crashes */ - WM_job_main_thread_lock_acquire(rp->job); - RE_Database_Free(re); - RE_Database_FromScene(re, rp->bmain, rp->scene, lay, 0); // 0= dont use camera view - WM_job_main_thread_lock_release(rp->job); - - /* do preprocessing like building raytree, shadows, volumes, SSS */ - RE_Database_Preprocess(re); - - /* conversion not completed, need to do it again */ - if (!rstats->convertdone) { - if (render_view3d_is_valid(rp)) { - rp->engine->job_update_flag |= PR_UPDATE_DATABASE; - } - } - - // printf("dbase update\n"); - } - else { - // printf("dbase rotate\n"); - RE_DataBase_IncrementalView(re, rp->viewmat, 0); - restore = 1; - } - - RE_DataBase_ApplyWindow(re); - - /* OK, can we enter render code? */ - if (rstats->convertdone) { - bool first_time = true; - - if (update_flag & PR_UPDATE_VIEW) { - ob_inst_update_flag |= RE_OBJECT_INSTANCES_UPDATE_VIEW; - } - - RE_updateRenderInstances(re, ob_inst_update_flag); - - for (;;) { - int pixel_size = BKE_render_preview_pixel_size(&rp->scene->r); - if (first_time == false) { - if (restore) - RE_DataBase_IncrementalView(re, rp->viewmat, 1); - - rp->resolution_divider = MAX2(rp->resolution_divider / 2, pixel_size); - *do_update = 1; - - render_update_resolution(re, rp, use_border, &cliprct); - - RE_DataBase_IncrementalView(re, rp->viewmat, 0); - RE_DataBase_ApplyWindow(re); - restore = 1; - } - else { - render_update_resolution(re, rp, use_border, &cliprct); - } - - RE_TileProcessor(re); - - first_time = false; - - if (*stop || rp->resolution_divider == pixel_size) { - break; - } - } - - /* always rotate back */ - if (restore) - RE_DataBase_IncrementalView(re, rp->viewmat, 1); - } -} - -static void render_view3d_free(void *customdata) -{ - RenderPreview *rp = customdata; - - MEM_freeN(rp); -} - -static bool render_view3d_flag_changed(RenderEngine *engine, const bContext *C) -{ - Main *bmain = CTX_data_main(C); - RegionView3D *rv3d = CTX_wm_region_view3d(C); - View3D *v3d = CTX_wm_view3d(C); - ARegion *ar = CTX_wm_region(C); - Scene *scene = CTX_data_scene(C); - Render *re; - rctf viewplane; - rcti disprect; - float clipsta, clipend; - bool orth; - int job_update_flag = 0; - char name[32]; - - /* ensure render engine exists */ - re = engine->re; - - if (!re) { - sprintf(name, "View3dPreview %p", (void *)ar); - re = engine->re = RE_GetRender(name); - if (!re) - re = engine->re = RE_NewRender(name); - - engine->update_flag |= RE_ENGINE_UPDATE_DATABASE; - } - - /* check update_flag */ - if (engine->update_flag & RE_ENGINE_UPDATE_MA) - job_update_flag |= PR_UPDATE_MATERIAL; - - if (engine->update_flag & RE_ENGINE_UPDATE_OTHER) - job_update_flag |= PR_UPDATE_MATERIAL; - - if (engine->update_flag & RE_ENGINE_UPDATE_DATABASE) { - job_update_flag |= PR_UPDATE_DATABASE; - - /* load editmesh */ - if (scene->obedit) - ED_object_editmode_load(bmain, scene->obedit); - } - - engine->update_flag = 0; - - /* check if viewport changed */ - if (engine->last_winx != ar->winx || engine->last_winy != ar->winy) { - engine->last_winx = ar->winx; - engine->last_winy = ar->winy; - job_update_flag |= PR_UPDATE_RENDERSIZE; - } - - if (compare_m4m4(engine->last_viewmat, rv3d->viewmat, 0.00001f) == 0) { - copy_m4_m4(engine->last_viewmat, rv3d->viewmat); - job_update_flag |= PR_UPDATE_VIEW; - } - - render_view3d_get_rects(ar, v3d, rv3d, &viewplane, engine, &clipsta, &clipend, NULL, &orth); - - if (BLI_rctf_compare(&viewplane, &engine->last_viewplane, 0.00001f) == 0) { - engine->last_viewplane = viewplane; - job_update_flag |= PR_UPDATE_VIEW; - } - - render_view3d_disprect(scene, ar, v3d, rv3d, &disprect); - if (BLI_rcti_compare(&disprect, &engine->last_disprect) == 0) { - engine->last_disprect = disprect; - job_update_flag |= PR_UPDATE_RENDERSIZE; - } - - /* any changes? go ahead and rerender */ - if (job_update_flag) { - engine->job_update_flag |= job_update_flag; - return true; - } - - return false; -} - -static void render_view3d_do(RenderEngine *engine, const bContext *C) -{ - wmJob *wm_job; - RenderPreview *rp; - Scene *scene = CTX_data_scene(C); - ARegion *ar = CTX_wm_region(C); - int width = ar->winx, height = ar->winy; - int divider = BKE_render_preview_pixel_size(&scene->r); - int resolution_threshold = scene->r.preview_start_resolution * - scene->r.preview_start_resolution; - - if (CTX_wm_window(C) == NULL) - return; - if (!render_view3d_flag_changed(engine, C)) - return; - - wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), CTX_wm_region(C), "Render Preview", - WM_JOB_EXCL_RENDER, WM_JOB_TYPE_RENDER_PREVIEW); - rp = MEM_callocN(sizeof(RenderPreview), "render preview"); - rp->job = wm_job; - - while (width * height > resolution_threshold) { - width = max_ii(1, width / 2); - height = max_ii(1, height / 2); - divider *= 2; - } - - /* customdata for preview thread */ - rp->scene = scene; - rp->engine = engine; - rp->sa = CTX_wm_area(C); - rp->ar = CTX_wm_region(C); - rp->v3d = rp->sa->spacedata.first; - rp->rv3d = CTX_wm_region_view3d(C); - rp->bmain = CTX_data_main(C); - rp->resolution_divider = divider; - rp->start_resolution_divider = divider; - rp->has_freestyle = (scene->r.mode & R_EDGE_FRS) != 0; - copy_m4_m4(rp->viewmat, rp->rv3d->viewmat); - - /* clear info text */ - engine->text[0] = '\0'; - - /* setup job */ - WM_jobs_customdata_set(wm_job, rp, render_view3d_free); - WM_jobs_timer(wm_job, 0.1, NC_SPACE | ND_SPACE_VIEW3D, NC_SPACE | ND_SPACE_VIEW3D); - WM_jobs_callbacks(wm_job, render_view3d_startjob, NULL, NULL, NULL); - - WM_jobs_start(CTX_wm_manager(C), wm_job); - - engine->flag &= ~RE_ENGINE_DO_UPDATE; -} - -/* callback for render engine, on changes */ -void render_view3d_update(RenderEngine *engine, const bContext *C) -{ - /* this shouldn't be needed and causes too many database rebuilds, but we - * aren't actually tracking updates for all relevant datablocks so this is - * a catch-all for updates */ - engine->update_flag |= RE_ENGINE_UPDATE_DATABASE; - - render_view3d_do(engine, C); -} - -void render_view3d_draw(RenderEngine *engine, const bContext *C) -{ - Render *re = engine->re; - RenderResult rres; - char name[32]; - - render_view3d_do(engine, C); - - if (re == NULL) { - sprintf(name, "View3dPreview %p", (void *)CTX_wm_region(C)); - re = RE_GetRender(name); - - if (re == NULL) return; - } - - /* Viewport render preview doesn't support multiview, view hardcoded to 0 */ - RE_AcquireResultImage(re, &rres, 0); - - if (rres.rectf) { - RegionView3D *rv3d = CTX_wm_region_view3d(C); - View3D *v3d = CTX_wm_view3d(C); - Scene *scene = CTX_data_scene(C); - ARegion *ar = CTX_wm_region(C); - bool force_fallback = false; - bool need_fallback = true; - float dither = scene->r.dither_intensity; - float scale_x, scale_y; - rcti clip_rect; - int xof, yof; - - if (render_view3d_disprect(scene, ar, v3d, rv3d, &clip_rect)) { - scale_x = (float) BLI_rcti_size_x(&clip_rect) / rres.rectx; - scale_y = (float) BLI_rcti_size_y(&clip_rect) / rres.recty; - xof = clip_rect.xmin; - yof = clip_rect.ymin; - } - else { - scale_x = (float) ar->winx / rres.rectx; - scale_y = (float) ar->winy / rres.recty; - xof = rres.xof; - yof = rres.yof; - } - - /* If user decided not to use GLSL, fallback to glaDrawPixelsAuto */ - force_fallback |= (U.image_draw_method != IMAGE_DRAW_METHOD_GLSL); - - /* Try using GLSL display transform. */ - if (force_fallback == false) { - if (IMB_colormanagement_setup_glsl_draw(&scene->view_settings, &scene->display_settings, dither, true)) { - glEnable(GL_BLEND); - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glPixelZoom(scale_x, scale_y); - glaDrawPixelsTex(xof, yof, rres.rectx, rres.recty, - GL_RGBA, GL_FLOAT, GL_NEAREST, rres.rectf); - glPixelZoom(1.0f, 1.0f); - glDisable(GL_BLEND); - - IMB_colormanagement_finish_glsl_draw(); - need_fallback = false; - } - } - - /* If GLSL failed, use old-school CPU-based transform. */ - if (need_fallback) { - unsigned char *display_buffer = MEM_mallocN(4 * rres.rectx * rres.recty * sizeof(char), - "render_view3d_draw"); - - IMB_colormanagement_buffer_make_display_space(rres.rectf, display_buffer, rres.rectx, rres.recty, - 4, dither, &scene->view_settings, &scene->display_settings); - - glEnable(GL_BLEND); - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glPixelZoom(scale_x, scale_y); - glaDrawPixelsAuto(xof, yof, rres.rectx, rres.recty, - GL_RGBA, GL_UNSIGNED_BYTE, - GL_NEAREST, display_buffer); - glPixelZoom(1.0f, 1.0f); - glDisable(GL_BLEND); - - MEM_freeN(display_buffer); - } - } - - RE_ReleaseResultImage(re); -} - -void ED_viewport_render_kill_jobs(wmWindowManager *wm, - Main *bmain, - bool free_database) -{ - bScreen *sc; - ScrArea *sa; - ARegion *ar; - - if (!wm) - return; - - /* kill all actively running jobs */ - WM_jobs_kill(wm, NULL, render_view3d_startjob); - - /* loop over 3D view render engines */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { - for (sa = sc->areabase.first; sa; sa = sa->next) { - if (sa->spacetype != SPACE_VIEW3D) - continue; - - for (ar = sa->regionbase.first; ar; ar = ar->next) { - RegionView3D *rv3d; - - if (ar->regiontype != RGN_TYPE_WINDOW) - continue; - - rv3d = ar->regiondata; - - if (rv3d->render_engine) { - /* free render database now before we change data, because - * RE_Database_Free will also loop over blender data */ - if (free_database) { - char name[32]; - Render *re; - - sprintf(name, "View3dPreview %p", (void *)ar); - re = RE_GetRender(name); - - if (re) - RE_Database_Free(re); - - /* tag render engine to update entire database */ - rv3d->render_engine->update_flag |= RE_ENGINE_UPDATE_DATABASE; - } - else { - /* quick shader update */ - rv3d->render_engine->update_flag |= RE_ENGINE_UPDATE_MA; - } - } - } - } - } -} - Scene *ED_render_job_get_scene(const bContext *C) { wmWindowManager *wm = CTX_wm_manager(C); @@ -1673,6 +1093,7 @@ Scene *ED_render_job_get_current_scene(const bContext *C) return NULL; } + /* Motion blur curve preset */ static int render_shutter_curve_preset_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 78cedf099a1..b5c1ffc64dd 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -55,6 +55,10 @@ #include "BKE_sequencer.h" #include "BKE_writeavi.h" +#include "DEG_depsgraph.h" + +#include "DRW_engine.h" + #include "WM_api.h" #include "WM_types.h" @@ -70,9 +74,9 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "GPU_glew.h" -#include "GPU_compositing.h" #include "GPU_framebuffer.h" +#include "GPU_glew.h" +#include "GPU_matrix.h" #include "render_intern.h" @@ -91,6 +95,9 @@ typedef struct OGLRender { Main *bmain; Render *re; Scene *scene; + WorkSpace *workspace; + ViewLayer *view_layer; + Depsgraph *depsgraph; View3D *v3d; RegionView3D *rv3d; @@ -114,7 +121,6 @@ typedef struct OGLRender { GPUOffScreen *ofs; int ofs_samples; bool ofs_full_samples; - GPUFX *fx; int sizex, sizey; int write_still; @@ -148,17 +154,6 @@ typedef struct OGLRender { #endif } OGLRender; -/* added because v3d is not always valid */ -static unsigned int screen_opengl_layers(OGLRender *oglrender) -{ - if (oglrender->v3d) { - return oglrender->scene->lay | oglrender->v3d->lay; - } - else { - return oglrender->scene->lay; - } -} - static bool screen_opengl_is_multiview(OGLRender *oglrender) { View3D *v3d = oglrender->v3d; @@ -271,8 +266,9 @@ static void screen_opengl_views_setup(OGLRender *oglrender) RE_ReleaseResult(oglrender->re); } -static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) +static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, RenderResult *rr) { + Depsgraph *depsgraph = CTX_data_depsgraph(C); Scene *scene = oglrender->scene; ARegion *ar = oglrender->ar; View3D *v3d = oglrender->v3d; @@ -281,9 +277,8 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) int sizex = oglrender->sizex; int sizey = oglrender->sizey; const short view_context = (v3d != NULL); - bool draw_bgpic = true; bool draw_sky = (scene->r.alphamode == R_ADDSKY); - unsigned char *rect = NULL; + float *rectf = NULL; const char *viewname = RE_GetActiveRenderView(oglrender->re); ImBuf *ibuf_result = NULL; @@ -324,13 +319,14 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) unsigned char *gp_rect; unsigned char *render_rect = (unsigned char *)RE_RenderViewGetById(rr, oglrender->view_id)->rect32; + DRW_opengl_context_enable(); GPU_offscreen_bind(oglrender->ofs, true); - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + GPU_clear_color(0.0f, 0.0f, 0.0f, 0.0f); + GPU_clear(GPU_COLOR_BIT | GPU_DEPTH_BIT); wmOrtho2(0, sizex, 0, sizey); - glTranslatef(sizex / 2, sizey / 2, 0.0f); + gpuTranslate2f(sizex / 2, sizey / 2); G.f |= G_RENDER_OGL; ED_gpencil_draw_ex(scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ); @@ -343,6 +339,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) blend_color_mix_byte(&render_rect[i], &render_rect[i], &gp_rect[i]); } GPU_offscreen_unbind(oglrender->ofs, true); + DRW_opengl_context_disable(); MEM_freeN(gp_rect); } @@ -357,12 +354,11 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) draw_flags |= (oglrender->ofs_full_samples) ? V3D_OFSDRAW_USE_FULL_SAMPLE : 0; if (view_context) { - draw_flags |= (draw_bgpic) ? V3D_OFSDRAW_USE_BACKGROUND : 0; - ibuf_view = ED_view3d_draw_offscreen_imbuf( - oglrender->bmain, scene, v3d, ar, sizex, sizey, - IB_rect, draw_flags, alpha_mode, oglrender->ofs_samples, viewname, - oglrender->fx, oglrender->ofs, err_out); + depsgraph, scene, v3d->drawtype, + v3d, ar, sizex, sizey, + IB_rectfloat, draw_flags, alpha_mode, oglrender->ofs_samples, viewname, + oglrender->ofs, err_out); /* for stamp only */ if (rv3d->persp == RV3D_CAMOB && v3d->camera) { @@ -370,18 +366,19 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) } } else { - draw_flags |= (V3D_OFSDRAW_USE_GPENCIL | V3D_OFSDRAW_USE_BACKGROUND); + draw_flags |= V3D_OFSDRAW_USE_GPENCIL; ibuf_view = ED_view3d_draw_offscreen_imbuf_simple( - oglrender->bmain, scene, scene->camera, oglrender->sizex, oglrender->sizey, - IB_rect, draw_flags, OB_SOLID, + depsgraph, scene, OB_SOLID, + scene->camera, oglrender->sizex, oglrender->sizey, + IB_rectfloat, draw_flags, alpha_mode, oglrender->ofs_samples, viewname, - oglrender->fx, oglrender->ofs, err_out); + oglrender->ofs, err_out); camera = scene->camera; } if (ibuf_view) { ibuf_result = ibuf_view; - rect = (unsigned char *)ibuf_view->rect; + rectf = (float *)ibuf_view->rect_float; } else { fprintf(stderr, "%s: failed to get buffer, %s\n", __func__, err_out); @@ -390,7 +387,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) if (ibuf_result != NULL) { if ((scene->r.stamp & R_STAMP_ALL) && (scene->r.stamp & R_STAMP_DRAW)) { - BKE_image_stamp_buf(scene, camera, NULL, rect, NULL, rr->rectx, rr->recty, 4); + BKE_image_stamp_buf(scene, camera, NULL, NULL, rectf, rr->rectx, rr->recty, 4); } RE_render_result_rect_from_ibuf(rr, &scene->r, ibuf_result, oglrender->view_id); IMB_freeImBuf(ibuf_result); @@ -435,7 +432,7 @@ static void addAlphaOverFloat(float dest[4], const float source[4]) } /* add renderlayer and renderpass for each grease pencil layer for using in composition */ -static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, RenderView *rv) +static void add_gpencil_renderpass(const bContext *C, OGLRender *oglrender, RenderResult *rr, RenderView *rv) { bGPdata *gpd = oglrender->scene->gpd; Scene *scene = oglrender->scene; @@ -479,7 +476,7 @@ static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, Rende } /* render this gp layer */ - screen_opengl_render_doit(oglrender, rr); + screen_opengl_render_doit(C, oglrender, rr); /* add RendePass composite */ RenderPass *rp = RE_create_gp_pass(rr, gpl->info, rv->name); @@ -519,7 +516,7 @@ static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, Rende scene->r.alphamode = oldalphamode; } -static void screen_opengl_render_apply(OGLRender *oglrender) +static void screen_opengl_render_apply(const bContext *C, OGLRender *oglrender) { RenderResult *rr; RenderView *rv; @@ -535,14 +532,13 @@ static void screen_opengl_render_apply(OGLRender *oglrender) int chanshown = sseq ? sseq->chanshown : 0; BKE_sequencer_new_render_data( - oglrender->bmain->eval_ctx, oglrender->bmain, scene, - oglrender->sizex, oglrender->sizey, 100.0f, + oglrender->bmain, oglrender->depsgraph, scene, + oglrender->sizex, oglrender->sizey, 100.0f, false, &context); for (view_id = 0; view_id < oglrender->views_len; view_id++) { context.view_id = view_id; context.gpu_offscreen = oglrender->ofs; - context.gpu_fx = oglrender->fx; context.gpu_full_samples = oglrender->ofs_full_samples; oglrender->seq_data.ibufs_arr[view_id] = BKE_sequencer_give_ibuf(&context, CFRA, chanshown); @@ -557,10 +553,10 @@ static void screen_opengl_render_apply(OGLRender *oglrender) /* add grease pencil passes. For sequencer, the render does not include renderpasses * TODO: The sequencer render of grease pencil should be rethought */ if (!oglrender->is_sequencer) { - add_gpencil_renderpass(oglrender, rr, rv); + add_gpencil_renderpass(C, oglrender, rr, rv); } /* render composite */ - screen_opengl_render_doit(oglrender, rr); + screen_opengl_render_doit(C, oglrender, rr); } RE_ReleaseResult(oglrender->re); @@ -576,11 +572,30 @@ static void screen_opengl_render_apply(OGLRender *oglrender) } } +static bool screen_opengl_fullsample_enabled(Scene *scene) +{ + if (scene->r.scemode & R_FULL_SAMPLE) { + return true; + } + else { + /* XXX TODO: + * Technically if the hardware supports MSAA we could keep using Blender 2.7x approach. + * However anti-aliasing without full_sample is not playing well even in 2.7x. + * + * For example, if you enable depth of field, there is aliasing, even if the viewport is fine. + * For 2.8x this is more complicated because so many things rely on shader. + * So until we fix the gpu_framebuffer anti-aliasing suupport we need to force full sample. + */ + return true; + } +} + static bool screen_opengl_render_init(bContext *C, wmOperator *op) { /* new render clears all callbacks */ wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win = CTX_wm_window(C); + WorkSpace *workspace = CTX_wm_workspace(C); Scene *scene = CTX_data_scene(C); ScrArea *prevsa = CTX_wm_area(C); @@ -589,7 +604,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) OGLRender *oglrender; int sizex, sizey; const int samples = (scene->r.mode & R_OSA) ? scene->r.osa : 0; - const bool full_samples = (samples != 0) && (scene->r.scemode & R_FULL_SAMPLE); + const bool full_samples = (samples != 0) && screen_opengl_fullsample_enabled(scene); bool is_view_context = RNA_boolean_get(op->ptr, "view_context"); const bool is_animation = RNA_boolean_get(op->ptr, "animation"); const bool is_sequencer = RNA_boolean_get(op->ptr, "sequencer"); @@ -634,7 +649,9 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) sizey = (scene->r.size * scene->r.ysch) / 100; /* corrects render size with actual size, not every card supports non-power-of-two dimensions */ - ofs = GPU_offscreen_create(sizex, sizey, full_samples ? 0 : samples, err_out); + DRW_opengl_context_enable(); /* Offscreen creation needs to be done in DRW context. */ + ofs = GPU_offscreen_create(sizex, sizey, full_samples ? 0 : samples, true, true, err_out); + DRW_opengl_context_disable(); if (!ofs) { BKE_reportf(op->reports, RPT_ERROR, "Failed to create OpenGL off-screen buffer, %s", err_out); @@ -652,6 +669,9 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->sizey = sizey; oglrender->bmain = CTX_data_main(C); oglrender->scene = scene; + oglrender->workspace = workspace; + oglrender->view_layer = CTX_data_view_layer(C); + oglrender->depsgraph = CTX_data_depsgraph(C); oglrender->cfrao = scene->r.cfra; oglrender->write_still = is_write_still && !is_animation; @@ -679,19 +699,6 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) /* apply immediately in case we're rendering from a script, * running notifiers again will overwrite */ oglrender->scene->customdata_mask |= oglrender->scene->customdata_mask_modal; - - if (oglrender->v3d->fx_settings.fx_flag & (GPU_FX_FLAG_DOF | GPU_FX_FLAG_SSAO)) { - oglrender->fx = GPU_fx_compositor_create(); - } - } - else if (is_sequencer) { - /* NOTE: We allow animation of DoF setting for flexibility in edits, so - * we can't check in advance whether we need FX compositor or not. - * We just always allocated it and make sure it doesn't add extra - * overhead rather than memory allocation here if it's not really - * needed. - */ - oglrender->fx = GPU_fx_compositor_create(); } /* create render */ @@ -706,7 +713,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->iuser.ok = 1; /* create render result */ - RE_InitState(oglrender->re, NULL, &scene->r, NULL, sizex, sizey, NULL); + RE_InitState(oglrender->re, NULL, &scene->r, &scene->view_layers, NULL, sizex, sizey, NULL); /* create render views */ screen_opengl_views_setup(oglrender); @@ -803,8 +810,9 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender) } if (oglrender->timer) { /* exec will not have a timer */ + Depsgraph *depsgraph = oglrender->depsgraph; scene->r.cfra = oglrender->cfrao; - BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, screen_opengl_layers(oglrender)); + BKE_scene_graph_update_for_newframe(depsgraph, bmain); WM_event_remove_timer(oglrender->wm, oglrender->win, oglrender->timer); } @@ -813,10 +821,9 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender) WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene); - if (oglrender->fx) - GPU_fx_compositor_destroy(oglrender->fx); - + DRW_opengl_context_enable(); GPU_offscreen_free(oglrender->ofs); + DRW_opengl_context_disable(); if (oglrender->is_sequencer) { MEM_freeN(oglrender->seq_data.ibufs_arr); @@ -1004,6 +1011,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); OGLRender *oglrender = op->customdata; Scene *scene = oglrender->scene; + Depsgraph *depsgraph = oglrender->depsgraph; char name[FILE_MAX]; bool ok = false; const bool view_context = (oglrender->v3d != NULL); @@ -1014,12 +1022,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) if (CFRA < oglrender->nfra) CFRA++; while (CFRA < oglrender->nfra) { - unsigned int lay = screen_opengl_layers(oglrender); - - if (lay & 0xFF000000) - lay &= 0xFF000000; - - BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, lay); + BKE_scene_graph_update_for_newframe(depsgraph, bmain); CFRA++; } @@ -1041,11 +1044,11 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) WM_cursor_time(oglrender->win, scene->r.cfra); - BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, screen_opengl_layers(oglrender)); + BKE_scene_graph_update_for_newframe(depsgraph, bmain); if (view_context) { if (oglrender->rv3d->persp == RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) { - /* since BKE_scene_update_for_newframe() is used rather + /* since BKE_scene_graph_update_for_newframe() is used rather * then ED_update_for_newframe() the camera needs to be set */ if (BKE_scene_camera_switch_update(scene)) { oglrender->v3d->camera = scene->camera; @@ -1057,7 +1060,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) } /* render into offscreen buffer */ - screen_opengl_render_apply(oglrender); + screen_opengl_render_apply(C, oglrender); /* save to disk */ rr = RE_AcquireResultRead(oglrender->re); @@ -1107,7 +1110,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, const wmEvent WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene); if (anim == 0) { - screen_opengl_render_apply(op->customdata); + screen_opengl_render_apply(C, op->customdata); screen_opengl_render_end(C, op->customdata); return OPERATOR_FINISHED; } @@ -1158,7 +1161,7 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op) if (!is_animation) { /* same as invoke */ /* render image */ - screen_opengl_render_apply(op->customdata); + screen_opengl_render_apply(C, op->customdata); screen_opengl_render_end(C, op->customdata); return OPERATOR_FINISHED; @@ -1175,7 +1178,7 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op) } /* no redraw needed, we leave state as we entered it */ -// ED_update_for_newframe(C, 1); +// ED_update_for_newframe(C); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, CTX_data_scene(C)); return OPERATOR_FINISHED; diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c index af3786a73f7..fd534dd9129 100644 --- a/source/blender/editors/render/render_ops.c +++ b/source/blender/editors/render/render_ops.c @@ -56,8 +56,8 @@ void ED_operatortypes_render(void) WM_operatortype_append(MATERIAL_OT_copy); WM_operatortype_append(MATERIAL_OT_paste); - WM_operatortype_append(SCENE_OT_render_layer_add); - WM_operatortype_append(SCENE_OT_render_layer_remove); + WM_operatortype_append(SCENE_OT_view_layer_add); + WM_operatortype_append(SCENE_OT_view_layer_remove); WM_operatortype_append(SCENE_OT_render_view_add); WM_operatortype_append(SCENE_OT_render_view_remove); @@ -85,9 +85,6 @@ void ED_operatortypes_render(void) WM_operatortype_append(TEXTURE_OT_slot_copy); WM_operatortype_append(TEXTURE_OT_slot_paste); WM_operatortype_append(TEXTURE_OT_slot_move); - WM_operatortype_append(TEXTURE_OT_envmap_save); - WM_operatortype_append(TEXTURE_OT_envmap_clear); - WM_operatortype_append(TEXTURE_OT_envmap_clear_all); /* render_internal.c */ WM_operatortype_append(RENDER_OT_view_show); diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index e1042f17229..04632838cf3 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -51,6 +51,7 @@ #include "DNA_world_types.h" #include "DNA_camera_types.h" +#include "DNA_group_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" @@ -69,6 +70,7 @@ #include "BKE_image.h" #include "BKE_icons.h" #include "BKE_lamp.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_library_remap.h" #include "BKE_main.h" @@ -78,6 +80,10 @@ #include "BKE_texture.h" #include "BKE_world.h" +#include "DEG_depsgraph.h" +#include "DEG_depsgraph_query.h" +#include "DEG_depsgraph_build.h" + #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" @@ -85,6 +91,7 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +#include "GPU_shader.h" #include "RE_pipeline.h" #include "RE_engine.h" @@ -94,6 +101,7 @@ #include "ED_datafiles.h" #include "ED_render.h" +#include "ED_screen.h" #ifndef NDEBUG /* Used for database init assert(). */ @@ -149,6 +157,7 @@ typedef struct ShaderPreview { short *stop, *do_update; Scene *scene; + Depsgraph *depsgraph; ID *id; ID *parent; MTex *slot; @@ -178,6 +187,7 @@ typedef struct IconPreviewSize { typedef struct IconPreview { Main *bmain; Scene *scene; + Depsgraph *depsgraph; void *owner; ID *id; ListBase sizes; @@ -236,52 +246,84 @@ void ED_preview_free_dbase(void) BKE_main_free(G_pr_main_cycles); } -static int preview_mat_has_sss(Material *mat, bNodeTree *ntree) +static Scene *preview_get_scene(Main *pr_main) { - if (mat) { - if (mat->sss_flag & MA_DIFF_SSS) - return 1; - if (mat->nodetree) - if (preview_mat_has_sss(NULL, mat->nodetree)) - return 1; - } - else if (ntree) { - bNode *node; - for (node = ntree->nodes.first; node; node = node->next) { - if (node->type == NODE_GROUP && node->id) { - if (preview_mat_has_sss(NULL, (bNodeTree *)node->id)) - return 1; - } - else if (node->id && ELEM(node->type, SH_NODE_MATERIAL, SH_NODE_MATERIAL_EXT)) { - mat = (Material *)node->id; - if (mat->sss_flag & MA_DIFF_SSS) - return 1; - } - } + if (pr_main == NULL) return NULL; + + return pr_main->scene.first; +} + +static const char *preview_collection_name(const char pr_type) +{ + switch (pr_type) { + case MA_FLAT: + return "Flat"; + case MA_SPHERE: + return "Sphere"; + case MA_CUBE: + return "Cube"; + case MA_MONKEY: + return "Monkey"; + case MA_SPHERE_A: + return "World Sphere"; + case MA_TEXTURE: + return "Texture"; + case MA_LAMP: + return "Lamp"; + case MA_SKY: + return "Sky"; + case MA_HAIR: + return "Hair"; + case MA_ATMOS: + return "Atmosphere"; + default: + BLI_assert(!"Unknown preview type"); + return ""; } - return 0; } -static Scene *preview_get_scene(Main *pr_main) +static void set_preview_collection(Scene *scene, ViewLayer *view_layer, char pr_type) { - if (pr_main == NULL) return NULL; + LayerCollection *lc = view_layer->layer_collections.first; + const char *collection_name = preview_collection_name(pr_type); - return pr_main->scene.first; + for (lc = lc->layer_collections.first; lc; lc = lc->next) { + if (STREQ(lc->collection->id.name + 2, collection_name)) { + lc->collection->flag &= ~COLLECTION_RESTRICT_RENDER; + } + else { + lc->collection->flag |= COLLECTION_RESTRICT_RENDER; + } + } + + BKE_layer_collection_sync(scene, view_layer); } +static World *preview_get_localized_world(ShaderPreview *sp, World *world) +{ + if (world == NULL) { + return NULL; + } + if (sp->worldcopy != NULL) { + return sp->worldcopy; + } + sp->worldcopy = BKE_world_localize(world); + BLI_addtail(&sp->pr_main->world, sp->worldcopy); + return sp->worldcopy; +} /* call this with a pointer to initialize preview scene */ /* call this with NULL to restore assigned ID pointers in preview scene */ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_type, ShaderPreview *sp) { Scene *sce; - Base *base; Main *pr_main = sp->pr_main; memcpy(pr_main->name, BKE_main_blendfile_path(bmain), sizeof(pr_main->name)); sce = preview_get_scene(pr_main); if (sce) { + ViewLayer *view_layer = sce->view_layers.first; /* this flag tells render to not execute depsgraph or ipos etc */ sce->r.scemode |= R_BUTS_PREVIEW; @@ -320,7 +362,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty * seems commonly used render engines does not support * such kind of rendering. */ - BLI_strncpy(sce->r.engine, RE_engine_id_BLENDER_RENDER, sizeof(sce->r.engine)); + BLI_strncpy(sce->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(sce->r.engine)); } else { BLI_strncpy(sce->r.engine, scene->r.engine, sizeof(sce->r.engine)); @@ -335,77 +377,26 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty sp->matcopy = mat; BLI_addtail(&pr_main->mat, mat); - if (!BKE_scene_use_new_shading_nodes(scene)) { - init_render_material(bmain, mat, 0, NULL); /* call that retrieves mode_l */ - end_render_material(mat); - - /* un-useful option */ - if (sp->pr_method == PR_ICON_RENDER) - mat->shade_flag &= ~MA_OBCOLOR; - - /* turn on raytracing if needed */ - if (mat->mode_l & MA_RAYMIRROR) - sce->r.mode |= R_RAYTRACE; - if (mat->material_type == MA_TYPE_VOLUME) - sce->r.mode |= R_RAYTRACE; - if ((mat->mode_l & MA_RAYTRANSP) && (mat->mode_l & MA_TRANSP)) - sce->r.mode |= R_RAYTRACE; - if (preview_mat_has_sss(mat, NULL)) - sce->r.mode |= R_SSS; - - /* turn off fake shadows if needed */ - /* this only works in a specific case where the preview.blend contains - * an object starting with 'c' which has a material linked to it (not the obdata) - * and that material has a fake shadow texture in the active texture slot */ - for (base = sce->base.first; base; base = base->next) { - if (base->object->id.name[2] == 'c') { - Material *shadmat = give_current_material(base->object, base->object->actcol); - if (shadmat) { - if (mat->mode2 & MA_CASTSHADOW) shadmat->septex = 0; - else shadmat->septex |= 1; - } - } - } - - /* turn off bounce lights for volume, - * doesn't make much visual difference and slows it down too */ - for (base = sce->base.first; base; base = base->next) { - if (base->object->type == OB_LAMP) { - /* if doesn't match 'Lamp.002' --> main key light */ - if (!STREQ(base->object->id.name + 2, "Lamp.002")) { - if (mat->material_type == MA_TYPE_VOLUME) - base->object->restrictflag |= OB_RESTRICT_RENDER; - else - base->object->restrictflag &= ~OB_RESTRICT_RENDER; - } - } - } + /* use current scene world to light sphere */ + if (mat->pr_type == MA_SPHERE_A && sp->pr_method == PR_BUTS_RENDER) { + /* Use current scene world to light sphere. */ + sce->world = preview_get_localized_world(sp, scene->world); } - else { - if (mat->pr_type == MA_SPHERE_A && sp->pr_method == PR_BUTS_RENDER) { - /* Use current scene world to light sphere. */ - sce->world = scene->world; - } - else if (sce->world) { - /* Use a default world color. Using the current - * scene world can be slow if it has big textures. */ - sce->world->use_nodes = false; - sce->world->horr = 0.5f; - sce->world->horg = 0.5f; - sce->world->horb = 0.5f; - } + else if (sce->world) { + /* Use a default world color. Using the current + * scene world can be slow if it has big textures. */ + sce->world->use_nodes = false; + sce->world->horr = 0.5f; + sce->world->horg = 0.5f; + sce->world->horb = 0.5f; } if (sp->pr_method == PR_ICON_RENDER) { - if (mat->material_type == MA_TYPE_HALO) { - sce->lay = 1 << MA_FLAT; - } - else { - sce->lay = 1 << MA_SPHERE_A; - } + set_preview_collection(sce, view_layer, MA_SPHERE_A); } else { - sce->lay = 1 << mat->pr_type; + set_preview_collection(sce, view_layer, mat->pr_type); + if (mat->nodetree && sp->pr_method == PR_NODE_RENDER) { /* two previews, they get copied by wmJob */ BKE_node_preview_init_tree(mat->nodetree, sp->sizex, sp->sizey, true); @@ -414,11 +405,11 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty } } else { - sce->r.mode &= ~(R_OSA | R_RAYTRACE | R_SSS); + sce->r.mode &= ~(R_OSA); } - for (base = sce->base.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (base->object->id.name[2] == 'p') { /* copy over object color, in case material uses it */ copy_v4_v4(base->object->col, sp->col); @@ -432,7 +423,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty (*matar)[actcol] = mat; } else if (base->object->type == OB_LAMP) { - base->object->restrictflag &= ~OB_RESTRICT_RENDER; + base->flag |= BASE_VISIBLE; } } } @@ -445,30 +436,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty sp->texcopy = tex; BLI_addtail(&pr_main->tex, tex); } - sce->lay = 1 << MA_TEXTURE; - - for (base = sce->base.first; base; base = base->next) { - if (base->object->id.name[2] == 't') { - Material *mat = give_current_material(base->object, base->object->actcol); - if (mat && mat->mtex[0]) { - mat->mtex[0]->tex = tex; - - if (tex && sp->slot) - mat->mtex[0]->which_output = sp->slot->which_output; - - mat->mtex[0]->mapto &= ~MAP_ALPHA; - mat->alpha = 1.0f; - - /* show alpha in this case */ - if (tex == NULL || (tex->flag & TEX_PRV_ALPHA)) { - if (!(tex && tex->type == TEX_IMAGE && (tex->imaflag & (TEX_USEALPHA | TEX_CALCALPHA)) == 0)) { - mat->mtex[0]->mapto |= MAP_ALPHA; - mat->alpha = 0.0f; - } - } - } - } - } + set_preview_collection(sce, view_layer, MA_TEXTURE); if (tex && tex->nodetree && sp->pr_method == PR_NODE_RENDER) { /* two previews, they get copied by wmJob */ @@ -486,30 +454,17 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty BLI_addtail(&pr_main->lamp, la); } - sce->lay = 1 << MA_LAMP; + set_preview_collection(sce, view_layer, MA_LAMP); - if (!BKE_scene_use_new_shading_nodes(scene)) { - if (la && la->type == LA_SUN && (la->sun_effect_type & LA_SUN_EFFECT_SKY)) { - sce->lay = 1 << MA_ATMOS; - sce->world = scene->world; - sce->camera = (Object *)BLI_findstring(&pr_main->object, "CameraAtmo", offsetof(ID, name) + 2); - } - else { - sce->world = NULL; - sce->camera = (Object *)BLI_findstring(&pr_main->object, "Camera", offsetof(ID, name) + 2); - } - } - else { - if (sce->world) { - /* Only use lighting from the lamp. */ - sce->world->use_nodes = false; - sce->world->horr = 0.0f; - sce->world->horg = 0.0f; - sce->world->horb = 0.0f; - } + if (sce->world) { + /* Only use lighting from the lamp. */ + sce->world->use_nodes = false; + sce->world->horr = 0.0f; + sce->world->horg = 0.0f; + sce->world->horb = 0.0f; } - for (base = sce->base.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (base->object->id.name[2] == 'p') { if (base->object->type == OB_LAMP) base->object->data = la; @@ -531,7 +486,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty BLI_addtail(&pr_main->world, wrld); } - sce->lay = 1 << MA_SKY; + set_preview_collection(sce, view_layer, MA_SKY); sce->world = wrld; if (wrld && wrld->nodetree && sp->pr_method == PR_NODE_RENDER) { @@ -607,7 +562,9 @@ static bool ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect, if (re) RE_AcquiredResultGet32(re, &rres, (unsigned int *)rect_byte, 0); - glaDrawPixelsSafe(fx, fy, rres.rectx, rres.recty, rres.rectx, GL_RGBA, GL_UNSIGNED_BYTE, rect_byte); + IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR); + immDrawPixelsTex(&state, fx, fy, rres.rectx, rres.recty, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, rect_byte, + 1.0f, 1.0f, NULL); MEM_freeN(rect_byte); @@ -728,6 +685,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs char name[32]; int sizex; Main *pr_main = sp->pr_main; + ID *id_eval = DEG_get_evaluated_id(sp->depsgraph, id); /* in case of split preview, use border render */ if (split) { @@ -747,7 +705,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs } /* get the stuff from the builtin preview dbase */ - sce = preview_prepare_scene(sp->bmain, sp->scene, id, idtype, sp); + sce = preview_prepare_scene(sp->bmain, sp->scene, id_eval, idtype, sp); if (sce == NULL) return; if (!split || first) sprintf(name, "Preview %p", sp->owner); @@ -1036,6 +994,12 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat *do_update = true; } + else if (idtype == ID_SCR) { + bScreen *screen = (bScreen *)id; + + ED_screen_preview_render(screen, sp->sizex, sp->sizey, sp->pr_rect); + *do_update = true; + } else { /* re-use shader job */ shader_preview_startjob(customdata, stop, do_update); @@ -1045,12 +1009,6 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat if (idtype == ID_WO) { set_alpha((char *)sp->pr_rect, sp->sizex, sp->sizey, 255); } - else if (idtype == ID_MA) { - Material *ma = (Material *)id; - - if (ma->material_type == MA_TYPE_HALO) - set_alpha((char *)sp->pr_rect, sp->sizex, sp->sizey, 255); - } } } } @@ -1095,7 +1053,6 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short { IconPreview *ip = (IconPreview *)customdata; IconPreviewSize *cur_size; - const bool use_new_shading = BKE_scene_use_new_shading_nodes(ip->scene); for (cur_size = ip->sizes.first; cur_size; cur_size = cur_size->next) { PreviewImage *prv = ip->owner; @@ -1110,6 +1067,7 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short /* construct shader preview from image size and previewcustomdata */ sp->scene = ip->scene; + sp->depsgraph = ip->depsgraph; sp->owner = ip->owner; sp->sizex = cur_size->sizex; sp->sizey = cur_size->sizey; @@ -1120,19 +1078,14 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short if (is_render) { BLI_assert(ip->id); - if (use_new_shading) { - /* texture icon rendering is hardcoded to use BI, - * so don't even think of using cycle's bmain for - * texture icons - */ - if (GS(ip->id->name) != ID_TE) - sp->pr_main = G_pr_main_cycles; - else - sp->pr_main = G_pr_main; - } - else { + /* texture icon rendering is hardcoded to use the BI scene, + * so don't even think of using cycle's bmain for + * texture icons + */ + if (GS(ip->id->name) != ID_TE) + sp->pr_main = G_pr_main_cycles; + else sp->pr_main = G_pr_main; - } } common_preview_startjob(sp, stop, do_update, progress); @@ -1227,6 +1180,7 @@ void ED_preview_icon_job(const bContext *C, void *owner, ID *id, unsigned int *r /* customdata for preview thread */ ip->bmain = CTX_data_main(C); ip->scene = CTX_data_scene(C); + ip->depsgraph = CTX_data_depsgraph(C); ip->owner = owner; ip->id = id; @@ -1255,10 +1209,11 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M ShaderPreview *sp; Scene *scene = CTX_data_scene(C); short id_type = GS(id->name); - bool use_new_shading = BKE_scene_use_new_shading_nodes(scene); + + /* Use workspace render only for buttons Window, since the other previews are related to the datablock. */ /* Only texture node preview is supported with Cycles. */ - if (use_new_shading && method == PR_NODE_RENDER && id_type != ID_TE) { + if (method == PR_NODE_RENDER && id_type != ID_TE) { return; } @@ -1270,6 +1225,7 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M /* customdata for preview thread */ sp->scene = scene; + sp->depsgraph = CTX_data_depsgraph(C); sp->owner = owner; sp->sizex = sizex; sp->sizey = sizey; @@ -1279,9 +1235,9 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M sp->slot = slot; sp->bmain = CTX_data_main(C); - /* hardcoded preview .blend for cycles/internal, this should be solved + /* hardcoded preview .blend for Eevee + Cycles, this should be solved * once with custom preview .blend path for external engines */ - if ((method != PR_NODE_RENDER) && id_type != ID_TE && use_new_shading) { + if ((method != PR_NODE_RENDER) && id_type != ID_TE) { sp->pr_main = G_pr_main_cycles; } else { @@ -1299,10 +1255,8 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M WM_jobs_start(CTX_wm_manager(C), wm_job); } -void ED_preview_kill_jobs(wmWindowManager *wm, Main *bmain) +void ED_preview_kill_jobs(wmWindowManager *wm, Main *UNUSED(bmain)) { if (wm) WM_jobs_kill(wm, NULL, common_preview_startjob); - - ED_viewport_render_kill_jobs(wm, bmain, false); } diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 5b198774b71..31f25720f8d 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -50,10 +50,10 @@ #include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_depsgraph.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_linestyle.h" #include "BKE_main.h" @@ -62,10 +62,12 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_texture.h" +#include "BKE_workspace.h" #include "BKE_world.h" #include "BKE_editmesh.h" - +#include "DEG_depsgraph.h" +#include "DEG_depsgraph_build.h" #ifdef WITH_FREESTYLE # include "BKE_freestyle.h" @@ -83,6 +85,7 @@ #include "ED_mesh.h" #include "ED_node.h" #include "ED_render.h" +#include "ED_scene.h" #include "ED_screen.h" #include "RNA_define.h" @@ -154,7 +157,7 @@ static int material_slot_remove_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL); } - DAG_id_tag_update(&ob->id, OB_RECALC_DATA); + DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); WM_event_add_notifier(C, NC_OBJECT | ND_OB_SHADING, ob); WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING_PREVIEW, ob); @@ -220,7 +223,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) } } - DAG_id_tag_update(&ob->id, OB_RECALC_DATA); + DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data); return OPERATOR_FINISHED; @@ -300,6 +303,7 @@ static int material_slot_de_select(bContext *C, bool select) } } + DEG_id_tag_update(ob->data, DEG_TAG_SELECT_UPDATE); WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob->data); return OPERATOR_FINISHED; @@ -361,7 +365,7 @@ static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op)) if (ob_iter->totcol == ob->totcol) { ob_iter->actcol = ob->actcol; - DAG_id_tag_update(&ob_iter->id, OB_RECALC_DATA); + DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob_iter); } } @@ -426,7 +430,7 @@ static int material_slot_move_exec(bContext *C, wmOperator *op) MEM_freeN(slot_remap); - DAG_id_tag_update(&ob->id, OB_RECALC_DATA); + DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); WM_event_add_notifier(C, NC_OBJECT | ND_DATA, ob); @@ -460,7 +464,6 @@ void OBJECT_OT_material_slot_move(wmOperatorType *ot) static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) { - Scene *scene = CTX_data_scene(C); Material *ma = CTX_data_pointer_get_type(C, "material", &RNA_Material).data; Main *bmain = CTX_data_main(C); PointerRNA ptr, idptr; @@ -472,11 +475,8 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) } else { ma = BKE_material_add(bmain, DATA_("Material")); - - if (BKE_scene_use_new_shading_nodes(scene)) { - ED_node_shader_default(C, &ma->id); - ma->use_nodes = true; - } + ED_node_shader_default(C, &ma->id); + ma->use_nodes = true; } /* hook into UI */ @@ -536,14 +536,6 @@ static int new_texture_exec(bContext *C, wmOperator *UNUSED(op)) * pointer use also increases user, so this compensates it */ id_us_min(&tex->id); - if (ptr.id.data && GS(((ID *)ptr.id.data)->name) == ID_MA && - RNA_property_pointer_get(&ptr, prop).id.data == NULL) - { - /* In case we are assigning new texture to a material, and active slot was empty, reset 'use' flag. */ - Material *ma = (Material *)ptr.id.data; - ma->septex &= ~(1 << ma->texact); - } - RNA_id_pointer_create(&tex->id, &idptr); RNA_property_pointer_set(&ptr, prop, idptr); RNA_property_update(C, &ptr, prop); @@ -572,7 +564,6 @@ void TEXTURE_OT_new(wmOperatorType *ot) static int new_world_exec(bContext *C, wmOperator *UNUSED(op)) { - Scene *scene = CTX_data_scene(C); World *wo = CTX_data_pointer_get_type(C, "world", &RNA_World).data; Main *bmain = CTX_data_main(C); PointerRNA ptr, idptr; @@ -584,11 +575,8 @@ static int new_world_exec(bContext *C, wmOperator *UNUSED(op)) } else { wo = BKE_world_add(bmain, DATA_("World")); - - if (BKE_scene_use_new_shading_nodes(scene)) { - ED_node_shader_default(C, &wo->id); - wo->use_nodes = true; - } + ED_node_shader_default(C, &wo->id); + wo->use_nodes = true; } /* hook into UI */ @@ -625,56 +613,61 @@ void WORLD_OT_new(wmOperatorType *ot) /********************** render layer operators *********************/ -static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) { + WorkSpace *workspace = CTX_wm_workspace(C); Scene *scene = CTX_data_scene(C); + ViewLayer *view_layer = BKE_view_layer_add(scene, NULL); - BKE_scene_add_render_layer(scene, NULL); - scene->r.actlay = BLI_listbase_count(&scene->r.layers) - 1; + if (workspace) { + BKE_workspace_view_layer_set(workspace, view_layer, scene); + } - DAG_id_tag_update(&scene->id, 0); - WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); + DEG_id_tag_update(&scene->id, 0); + DEG_relations_tag_update(CTX_data_main(C)); + WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene); return OPERATOR_FINISHED; } -void SCENE_OT_render_layer_add(wmOperatorType *ot) +void SCENE_OT_view_layer_add(wmOperatorType *ot) { /* identifiers */ - ot->name = "Add Render Layer"; - ot->idname = "SCENE_OT_render_layer_add"; - ot->description = "Add a render layer"; + ot->name = "Add View Layer"; + ot->idname = "SCENE_OT_view_layer_add"; + ot->description = "Add a view layer"; /* api callbacks */ - ot->exec = render_layer_add_exec; + ot->exec = view_layer_add_exec; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; } -static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) { + Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneRenderLayer *rl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); - if (!BKE_scene_remove_render_layer(CTX_data_main(C), scene, rl)) + if (!ED_scene_view_layer_delete(bmain, scene, view_layer, NULL)) { return OPERATOR_CANCELLED; + } - DAG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); return OPERATOR_FINISHED; } -void SCENE_OT_render_layer_remove(wmOperatorType *ot) +void SCENE_OT_view_layer_remove(wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove Render Layer"; - ot->idname = "SCENE_OT_render_layer_remove"; - ot->description = "Remove the selected render layer"; + ot->name = "Remove View Layer"; + ot->idname = "SCENE_OT_view_layer_remove"; + ot->description = "Remove the selected view layer"; /* api callbacks */ - ot->exec = render_layer_remove_exec; + ot->exec = view_layer_remove_exec; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; @@ -771,9 +764,9 @@ static bool freestyle_active_module_poll(bContext *C) static int freestyle_module_add_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); - BKE_freestyle_module_add(&srl->freestyleConfig); + BKE_freestyle_module_add(&view_layer->freestyle_config); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -797,13 +790,13 @@ void SCENE_OT_freestyle_module_add(wmOperatorType *ot) static int freestyle_module_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings); FreestyleModuleConfig *module = ptr.data; - BKE_freestyle_module_delete(&srl->freestyleConfig, module); + BKE_freestyle_module_delete(&view_layer->freestyle_config, module); - DAG_id_tag_update(&scene->id, 0); + DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); return OPERATOR_FINISHED; @@ -827,13 +820,13 @@ void SCENE_OT_freestyle_module_remove(wmOperatorType *ot) static int freestyle_module_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings); FreestyleModuleConfig *module = ptr.data; int dir = RNA_enum_get(op->ptr, "direction"); - if (BKE_freestyle_module_move(&srl->freestyleConfig, module, dir)) { - DAG_id_tag_update(&scene->id, 0); + if (BKE_freestyle_module_move(&view_layer->freestyle_config, module, dir)) { + DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); } @@ -869,11 +862,11 @@ static int freestyle_lineset_add_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); - BKE_freestyle_lineset_add(bmain, &srl->freestyleConfig, NULL); + BKE_freestyle_lineset_add(bmain, &view_layer->freestyle_config, NULL); - DAG_id_tag_update(&scene->id, 0); + DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); return OPERATOR_FINISHED; @@ -895,22 +888,20 @@ void SCENE_OT_freestyle_lineset_add(wmOperatorType *ot) static bool freestyle_active_lineset_poll(bContext *C) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); - if (!srl) { + if (!view_layer) { return false; } - return BKE_freestyle_lineset_get_active(&srl->freestyleConfig) != NULL; + return BKE_freestyle_lineset_get_active(&view_layer->freestyle_config) != NULL; } static int freestyle_lineset_copy_exec(bContext *C, wmOperator *UNUSED(op)) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); - FRS_copy_active_lineset(&srl->freestyleConfig); + FRS_copy_active_lineset(&view_layer->freestyle_config); return OPERATOR_FINISHED; } @@ -933,11 +924,11 @@ void SCENE_OT_freestyle_lineset_copy(wmOperatorType *ot) static int freestyle_lineset_paste_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); - FRS_paste_active_lineset(&srl->freestyleConfig); + FRS_paste_active_lineset(&view_layer->freestyle_config); - DAG_id_tag_update(&scene->id, 0); + DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); return OPERATOR_FINISHED; @@ -961,11 +952,11 @@ void SCENE_OT_freestyle_lineset_paste(wmOperatorType *ot) static int freestyle_lineset_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); - FRS_delete_active_lineset(&srl->freestyleConfig); + FRS_delete_active_lineset(&view_layer->freestyle_config); - DAG_id_tag_update(&scene->id, 0); + DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); return OPERATOR_FINISHED; @@ -989,11 +980,11 @@ void SCENE_OT_freestyle_lineset_remove(wmOperatorType *ot) static int freestyle_lineset_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + ViewLayer *view_layer = CTX_data_view_layer(C); int dir = RNA_enum_get(op->ptr, "direction"); - if (FRS_move_active_lineset(&srl->freestyleConfig, dir)) { - DAG_id_tag_update(&scene->id, 0); + if (FRS_move_active_lineset(&view_layer->freestyle_config, dir)) { + DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); } @@ -1028,9 +1019,8 @@ void SCENE_OT_freestyle_lineset_move(wmOperatorType *ot) static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); if (!lineset) { BKE_report(op->reports, RPT_ERROR, "No active lineset to add a new line style to"); @@ -1043,7 +1033,7 @@ static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op) else { lineset->linestyle = BKE_linestyle_new(bmain, "LineStyle"); } - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); return OPERATOR_FINISHED; @@ -1066,9 +1056,8 @@ void SCENE_OT_freestyle_linestyle_new(wmOperatorType *ot) static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1079,7 +1068,7 @@ static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op) BKE_report(op->reports, RPT_ERROR, "Unknown line color modifier type"); return OPERATOR_CANCELLED; } - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); return OPERATOR_FINISHED; @@ -1106,9 +1095,8 @@ void SCENE_OT_freestyle_color_modifier_add(wmOperatorType *ot) static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1119,7 +1107,7 @@ static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op) BKE_report(op->reports, RPT_ERROR, "Unknown alpha transparency modifier type"); return OPERATOR_CANCELLED; } - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); return OPERATOR_FINISHED; @@ -1146,9 +1134,8 @@ void SCENE_OT_freestyle_alpha_modifier_add(wmOperatorType *ot) static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1159,7 +1146,7 @@ static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op) BKE_report(op->reports, RPT_ERROR, "Unknown line thickness modifier type"); return OPERATOR_CANCELLED; } - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); return OPERATOR_FINISHED; @@ -1186,9 +1173,8 @@ void SCENE_OT_freestyle_thickness_modifier_add(wmOperatorType *ot) static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1199,7 +1185,7 @@ static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op) BKE_report(op->reports, RPT_ERROR, "Unknown stroke geometry modifier type"); return OPERATOR_CANCELLED; } - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); return OPERATOR_FINISHED; @@ -1239,9 +1225,8 @@ static int freestyle_get_modifier_type(PointerRNA *ptr) static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; @@ -1266,7 +1251,7 @@ static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op) BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier"); return OPERATOR_CANCELLED; } - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); return OPERATOR_FINISHED; @@ -1289,9 +1274,8 @@ void SCENE_OT_freestyle_modifier_remove(wmOperatorType *ot) static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; @@ -1316,7 +1300,7 @@ static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op) BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier"); return OPERATOR_CANCELLED; } - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); return OPERATOR_FINISHED; @@ -1339,9 +1323,8 @@ void SCENE_OT_freestyle_modifier_copy(wmOperatorType *ot) static int freestyle_modifier_move_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&srl->freestyleConfig); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; int dir = RNA_enum_get(op->ptr, "direction"); @@ -1370,7 +1353,7 @@ static int freestyle_modifier_move_exec(bContext *C, wmOperator *op) } if (changed) { - DAG_id_tag_update(&lineset->linestyle->id, 0); + DEG_id_tag_update(&lineset->linestyle->id, 0); WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle); } @@ -1405,8 +1388,8 @@ void SCENE_OT_freestyle_modifier_move(wmOperatorType *ot) static int freestyle_stroke_material_create_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - Scene *scene = CTX_data_scene(C); - FreestyleLineStyle *linestyle = BKE_linestyle_active_from_scene(scene); + ViewLayer *view_layer = CTX_data_view_layer(C); + FreestyleLineStyle *linestyle = BKE_linestyle_active_from_view_layer(view_layer); if (!linestyle) { BKE_report(op->reports, RPT_ERROR, "No active line style in the current scene"); @@ -1456,15 +1439,6 @@ static int texture_slot_move_exec(bContext *C, wmOperator *op) BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act, act - 1, 0); BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, -1, act, 0); - if (GS(id->name) == ID_MA) { - Material *ma = (Material *)id; - int mtexuse = ma->septex & (1 << act); - ma->septex &= ~(1 << act); - ma->septex |= (ma->septex & (1 << (act - 1))) << 1; - ma->septex &= ~(1 << (act - 1)); - ma->septex |= mtexuse >> 1; - } - set_active_mtex(id, act - 1); } } @@ -1478,20 +1452,11 @@ static int texture_slot_move_exec(bContext *C, wmOperator *op) BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act, act + 1, 0); BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, -1, act, 0); - if (GS(id->name) == ID_MA) { - Material *ma = (Material *)id; - int mtexuse = ma->septex & (1 << act); - ma->septex &= ~(1 << act); - ma->septex |= (ma->septex & (1 << (act + 1))) >> 1; - ma->septex &= ~(1 << (act + 1)); - ma->septex |= mtexuse << 1; - } - set_active_mtex(id, act + 1); } } - DAG_id_tag_update(id, 0); + DEG_id_tag_update(id, 0); WM_event_add_notifier(C, NC_TEXTURE, CTX_data_scene(C)); } @@ -1522,181 +1487,6 @@ void TEXTURE_OT_slot_move(wmOperatorType *ot) -/********************** environment map operators *********************/ - -static int save_envmap(wmOperator *op, Scene *scene, EnvMap *env, char *path, const char imtype) -{ - PropertyRNA *prop; - float layout[12]; - - if ((prop = RNA_struct_find_property(op->ptr, "layout"))) { - RNA_property_float_get_array(op->ptr, prop, layout); - } - else { - memcpy(layout, default_envmap_layout, sizeof(layout)); - } - - if (RE_WriteEnvmapResult(op->reports, scene, env, path, imtype, layout)) { - return OPERATOR_FINISHED; - } - else { - return OPERATOR_CANCELLED; - } - -} - -static int envmap_save_exec(bContext *C, wmOperator *op) -{ - Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data; - Scene *scene = CTX_data_scene(C); - //int imtype = RNA_enum_get(op->ptr, "file_type"); - char imtype = scene->r.im_format.imtype; - char path[FILE_MAX]; - - RNA_string_get(op->ptr, "filepath", path); - - if (scene->r.scemode & R_EXTENSION) { - BKE_image_path_ensure_ext_from_imformat(path, &scene->r.im_format); - } - - WM_cursor_wait(1); - - save_envmap(op, scene, tex->env, path, imtype); - - WM_cursor_wait(0); - - WM_event_add_notifier(C, NC_TEXTURE, tex); - - return OPERATOR_FINISHED; -} - -static int envmap_save_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) -{ - Main *bmain = CTX_data_main(C); - //Scene *scene= CTX_data_scene(C); - - if (RNA_struct_property_is_set(op->ptr, "filepath")) - return envmap_save_exec(C, op); - - //RNA_enum_set(op->ptr, "file_type", scene->r.im_format.imtype); - RNA_string_set(op->ptr, "filepath", BKE_main_blendfile_path(bmain)); - WM_event_add_fileselect(C, op); - - return OPERATOR_RUNNING_MODAL; -} - -static bool envmap_save_poll(bContext *C) -{ - Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data; - - if (!tex) - return 0; - if (!tex->env || !tex->env->ok) - return 0; - if (tex->env->cube[1] == NULL) - return 0; - - return 1; -} - -void TEXTURE_OT_envmap_save(wmOperatorType *ot) -{ - PropertyRNA *prop; - /* identifiers */ - ot->name = "Save Environment Map"; - ot->idname = "TEXTURE_OT_envmap_save"; - ot->description = "Save the current generated Environment map to an image file"; - - /* api callbacks */ - ot->exec = envmap_save_exec; - ot->invoke = envmap_save_invoke; - ot->poll = envmap_save_poll; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_INTERNAL; /* no undo since this doesnt modify the env-map */ - - /* properties */ - prop = RNA_def_float_array(ot->srna, "layout", 12, default_envmap_layout, 0.0f, 0.0f, - "File layout", - "Flat array describing the X,Y position of each cube face in the output image, " - "where 1 is the size of a face - order is [+Z -Z +Y -X -Y +X] " - "(use -1 to skip a face)", 0.0f, 0.0f); - RNA_def_property_flag(prop, PROP_HIDDEN); - - WM_operator_properties_filesel( - ot, FILE_TYPE_FOLDER | FILE_TYPE_IMAGE | FILE_TYPE_MOVIE, FILE_SPECIAL, FILE_SAVE, - WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); -} - -static int envmap_clear_exec(bContext *C, wmOperator *UNUSED(op)) -{ - Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data; - - BKE_texture_envmap_free_data(tex->env); - - WM_event_add_notifier(C, NC_TEXTURE | NA_EDITED, tex); - - return OPERATOR_FINISHED; -} - -static bool envmap_clear_poll(bContext *C) -{ - Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data; - - if (!tex) - return 0; - if (!tex->env || !tex->env->ok) - return 0; - if (tex->env->cube[1] == NULL) - return 0; - - return 1; -} - -void TEXTURE_OT_envmap_clear(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Clear Environment Map"; - ot->idname = "TEXTURE_OT_envmap_clear"; - ot->description = "Discard the environment map and free it from memory"; - - /* api callbacks */ - ot->exec = envmap_clear_exec; - ot->poll = envmap_clear_poll; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; -} - -static int envmap_clear_all_exec(bContext *C, wmOperator *UNUSED(op)) -{ - Main *bmain = CTX_data_main(C); - Tex *tex; - - for (tex = bmain->tex.first; tex; tex = tex->id.next) - if (tex->env) - BKE_texture_envmap_free_data(tex->env); - - WM_event_add_notifier(C, NC_TEXTURE | NA_EDITED, tex); - - return OPERATOR_FINISHED; -} - -void TEXTURE_OT_envmap_clear_all(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Clear All Environment Maps"; - ot->idname = "TEXTURE_OT_envmap_clear_all"; - ot->description = "Discard all environment maps in the .blend file and free them from memory"; - - /* api callbacks */ - ot->exec = envmap_clear_all_exec; - ot->poll = envmap_clear_poll; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - /********************** material operators *********************/ /* material copy/paste */ @@ -1768,17 +1558,6 @@ static void copy_mtex_copybuf(ID *id) MTex **mtex = NULL; switch (GS(id->name)) { - case ID_MA: - mtex = &(((Material *)id)->mtex[(int)((Material *)id)->texact]); - break; - case ID_LA: - mtex = &(((Lamp *)id)->mtex[(int)((Lamp *)id)->texact]); - // la->mtex[(int)la->texact] // TODO - break; - case ID_WO: - mtex = &(((World *)id)->mtex[(int)((World *)id)->texact]); - // mtex= wrld->mtex[(int)wrld->texact]; // TODO - break; case ID_PA: mtex = &(((ParticleSettings *)id)->mtex[(int)((ParticleSettings *)id)->texact]); break; @@ -1806,17 +1585,6 @@ static void paste_mtex_copybuf(ID *id) return; switch (GS(id->name)) { - case ID_MA: - mtex = &(((Material *)id)->mtex[(int)((Material *)id)->texact]); - break; - case ID_LA: - mtex = &(((Lamp *)id)->mtex[(int)((Lamp *)id)->texact]); - // la->mtex[(int)la->texact] // TODO - break; - case ID_WO: - mtex = &(((World *)id)->mtex[(int)((World *)id)->texact]); - // mtex= wrld->mtex[(int)wrld->texact]; // TODO - break; case ID_PA: mtex = &(((ParticleSettings *)id)->mtex[(int)((ParticleSettings *)id)->texact]); break; diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index ceb4c0b27ba..97fd7295a7b 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -38,24 +38,27 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" +#include "DNA_workspace_types.h" #include "DNA_world_types.h" #include "DNA_windowmanager_types.h" +#include "DRW_engine.h" + #include "BLI_listbase.h" #include "BLI_threads.h" #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_DerivedMesh.h" #include "BKE_icons.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_node.h" #include "BKE_paint.h" #include "BKE_scene.h" +#include "BKE_workspace.h" #include "GPU_material.h" -#include "GPU_buffers.h" #include "RE_engine.h" #include "RE_pipeline.h" @@ -64,16 +67,23 @@ #include "ED_render.h" #include "ED_view3d.h" +#include "DEG_depsgraph.h" + +#include "WM_api.h" + #include "render_intern.h" // own include extern Material defmaterial; /***************************** Render Engines ********************************/ -void ED_render_scene_update(Main *bmain, Scene *scene, int updated) +void ED_render_scene_update(const DEGEditorUpdateContext *update_ctx, int updated) { /* viewport rendering update on data changes, happens after depsgraph * updates if there was any change. context is set to the 3d view */ + Main *bmain = update_ctx->bmain; + Scene *scene = update_ctx->scene; + ViewLayer *view_layer = update_ctx->view_layer; bContext *C; wmWindowManager *wm; wmWindow *win; @@ -102,26 +112,23 @@ void ED_render_scene_update(Main *bmain, Scene *scene, int updated) wm = bmain->wm.first; for (win = wm->windows.first; win; win = win->next) { - bScreen *sc = win->screen; + bScreen *sc = WM_window_get_active_screen(win); ScrArea *sa; ARegion *ar; CTX_wm_window_set(C, win); for (sa = sc->areabase.first; sa; sa = sa->next) { - if (sa->spacetype != SPACE_VIEW3D) + if (sa->spacetype != SPACE_VIEW3D) { continue; - + } + View3D *v3d = sa->spacedata.first; for (ar = sa->regionbase.first; ar; ar = ar->next) { - RegionView3D *rv3d; - RenderEngine *engine; - - if (ar->regiontype != RGN_TYPE_WINDOW) + if (ar->regiontype != RGN_TYPE_WINDOW) { continue; - - rv3d = ar->regiondata; - engine = rv3d->render_engine; - + } + RegionView3D *rv3d = ar->regiondata; + RenderEngine *engine = rv3d->render_engine; /* call update if the scene changed, or if the render engine * tagged itself for update (e.g. because it was busy at the * time of the last update) */ @@ -133,6 +140,23 @@ void ED_render_scene_update(Main *bmain, Scene *scene, int updated) engine->flag &= ~RE_ENGINE_DO_UPDATE; engine->type->view_update(engine, C); + + } + else { + RenderEngineType *engine_type = + ED_view3d_engine_type(scene, v3d->drawtype); + if (updated) { + DRW_notify_view_update( + (&(DRWUpdateContext){ + .bmain = bmain, + .depsgraph = update_ctx->depsgraph, + .scene = scene, + .view_layer = view_layer, + .ar = ar, + .v3d = (View3D *)sa->spacedata.first, + .engine_type = engine_type + })); + } } } } @@ -143,23 +167,6 @@ void ED_render_scene_update(Main *bmain, Scene *scene, int updated) recursive_check = false; } -void ED_render_scene_update_pre(Main *bmain, Scene *scene, bool time) -{ - /* Blender internal might access to the data which is gonna to be freed - * by the scene update functions. This applies for example to simulation - * data like smoke and fire. - */ - if (time && !BKE_scene_use_new_shading_nodes(scene)) { - bScreen *sc; - ScrArea *sa; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { - for (sa = sc->areabase.first; sa; sa = sa->next) { - ED_render_engine_area_exit(bmain, sa); - } - } - } -} - void ED_render_engine_area_exit(Main *bmain, ScrArea *sa) { /* clear all render engines in this area */ @@ -179,18 +186,23 @@ void ED_render_engine_area_exit(Main *bmain, ScrArea *sa) void ED_render_engine_changed(Main *bmain) { /* on changing the render engine type, clear all running render engines */ - bScreen *sc; - ScrArea *sa; - Scene *scene; - - for (sc = bmain->screen.first; sc; sc = sc->id.next) - for (sa = sc->areabase.first; sa; sa = sa->next) + for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) { + for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) { ED_render_engine_area_exit(bmain, sa); - + } + } RE_FreePersistentData(); - - for (scene = bmain->scene.first; scene; scene = scene->id.next) { - ED_render_id_flush_update(bmain, &scene->id); + /* Inform all render engines and draw managers. */ + DEGEditorUpdateContext update_ctx = {NULL}; + update_ctx.bmain = bmain; + for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + update_ctx.scene = scene; + LISTBASE_FOREACH(ViewLayer *, view_layer, &scene->view_layers) { + /* TDODO(sergey): Iterate over depsgraphs instead? */ + update_ctx.depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); + update_ctx.view_layer = view_layer; + ED_render_id_flush_update(&update_ctx, &scene->id); + } if (scene->nodetree) { ntreeCompositUpdateRLayers(scene->nodetree); } @@ -198,7 +210,7 @@ void ED_render_engine_changed(Main *bmain) } /***************************** Updates *********************************** - * ED_render_id_flush_update gets called from DAG_id_tag_update, to do * + * ED_render_id_flush_update gets called from DEG_id_tag_update, to do * * editor level updates when the ID changes. when these ID blocks are in * * the dependency graph, we can get rid of the manual dependency checks */ @@ -228,207 +240,42 @@ static void render_engine_flag_changed(Main *bmain, int update_flag) } } -static int mtex_use_tex(MTex **mtex, int tot, Tex *tex) -{ - int a; - - if (!mtex) - return 0; - - for (a = 0; a < tot; a++) - if (mtex[a] && mtex[a]->tex == tex) - return 1; - - return 0; -} - -static int nodes_use_tex(bNodeTree *ntree, Tex *tex) -{ - bNode *node; - - for (node = ntree->nodes.first; node; node = node->next) { - if (node->id) { - if (node->id == (ID *)tex) { - return 1; - } - else if (GS(node->id->name) == ID_MA) { - if (mtex_use_tex(((Material *)node->id)->mtex, MAX_MTEX, tex)) - return 1; - } - else if (node->type == NODE_GROUP) { - if (nodes_use_tex((bNodeTree *)node->id, tex)) - return 1; - } - } - } - - return 0; -} - -static int nodes_use_material(bNodeTree *ntree, Material *ma) +static void material_changed(Main *UNUSED(bmain), Material *ma) { - bNode *node; - - for (node = ntree->nodes.first; node; node = node->next) { - if (node->id) { - if (node->id == (ID *)ma) { - return 1; - } - else if (node->type == NODE_GROUP) { - if (nodes_use_material((bNodeTree *)node->id, ma)) - return 1; - } - } - } - - return 0; -} - -static void material_changed(Main *bmain, Material *ma) -{ - Material *parent; - Object *ob; - Scene *scene; - int texture_draw = false; - /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&ma->id)); /* glsl */ - if (ma->gpumaterial.first) - GPU_material_free(&ma->gpumaterial); - - /* find node materials using this */ - for (parent = bmain->mat.first; parent; parent = parent->id.next) { - if (parent->use_nodes && parent->nodetree && nodes_use_material(parent->nodetree, ma)) { - /* pass */ - } - else { - continue; - } - - BKE_icon_changed(BKE_icon_id_ensure(&parent->id)); - - if (parent->gpumaterial.first) - GPU_material_free(&parent->gpumaterial); - } - - /* find if we have a scene with textured display */ - for (scene = bmain->scene.first; scene; scene = scene->id.next) { - if (scene->customdata_mask & CD_MASK_MTFACE) { - texture_draw = true; - break; - } - } - - /* find textured objects */ - if (texture_draw) { - for (ob = bmain->object.first; ob; ob = ob->id.next) { - DerivedMesh *dm = ob->derivedFinal; - Material ***material = give_matarar(ob); - short a, *totmaterial = give_totcolp(ob); - - if (dm && totmaterial && material) { - for (a = 0; a < *totmaterial; a++) { - if ((*material)[a] == ma) { - GPU_drawobject_free(dm); - break; - } - } - } + if (ma->id.recalc & ID_RECALC) { + if (!BLI_listbase_is_empty(&ma->gpumaterial)) { + GPU_material_free(&ma->gpumaterial); } } - } -static void lamp_changed(Main *bmain, Lamp *la) +static void lamp_changed(Main *UNUSED(bmain), Lamp *la) { - Object *ob; - Material *ma; - /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&la->id)); - /* glsl */ - for (ob = bmain->object.first; ob; ob = ob->id.next) - if (ob->data == la && ob->gpulamp.first) - GPU_lamp_free(ob); - - for (ma = bmain->mat.first; ma; ma = ma->id.next) - if (ma->gpumaterial.first) - GPU_material_free(&ma->gpumaterial); - if (defmaterial.gpumaterial.first) GPU_material_free(&defmaterial.gpumaterial); } -static int material_uses_texture(Material *ma, Tex *tex) -{ - if (mtex_use_tex(ma->mtex, MAX_MTEX, tex)) - return true; - else if (ma->use_nodes && ma->nodetree && nodes_use_tex(ma->nodetree, tex)) - return true; - - return false; -} - static void texture_changed(Main *bmain, Tex *tex) { - Material *ma; - Lamp *la; - World *wo; Scene *scene; - Object *ob; + ViewLayer *view_layer; bNode *node; - bool texture_draw = false; /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&tex->id)); /* paint overlays */ - for (scene = bmain->scene.first; scene; scene = scene->id.next) - BKE_paint_invalidate_overlay_tex(scene, tex); - - /* find materials */ - for (ma = bmain->mat.first; ma; ma = ma->id.next) { - if (!material_uses_texture(ma, tex)) - continue; - - BKE_icon_changed(BKE_icon_id_ensure(&ma->id)); - - if (ma->gpumaterial.first) - GPU_material_free(&ma->gpumaterial); - } - - /* find lamps */ - for (la = bmain->lamp.first; la; la = la->id.next) { - if (mtex_use_tex(la->mtex, MAX_MTEX, tex)) { - lamp_changed(bmain, la); - } - else if (la->nodetree && nodes_use_tex(la->nodetree, tex)) { - lamp_changed(bmain, la); - } - else { - continue; - } - } - - /* find worlds */ - for (wo = bmain->world.first; wo; wo = wo->id.next) { - if (mtex_use_tex(wo->mtex, MAX_MTEX, tex)) { - /* pass */ - } - else if (wo->nodetree && nodes_use_tex(wo->nodetree, tex)) { - /* pass */ - } - else { - continue; + for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + BKE_paint_invalidate_overlay_tex(scene, view_layer, tex); } - - BKE_icon_changed(BKE_icon_id_ensure(&wo->id)); - - if (wo->gpumaterial.first) - GPU_material_free(&wo->gpumaterial); } /* find compositing nodes */ @@ -439,52 +286,26 @@ static void texture_changed(Main *bmain, Tex *tex) ED_node_tag_update_id(&scene->id); } } - - if (scene->customdata_mask & CD_MASK_MTFACE) - texture_draw = true; - } - - /* find textured objects */ - if (texture_draw) { - for (ob = bmain->object.first; ob; ob = ob->id.next) { - DerivedMesh *dm = ob->derivedFinal; - Material ***material = give_matarar(ob); - short a, *totmaterial = give_totcolp(ob); - - if (dm && totmaterial && material) { - for (a = 0; a < *totmaterial; a++) { - if (ob->matbits && ob->matbits[a]) - ma = ob->mat[a]; - else - ma = (*material)[a]; - - if (ma && material_uses_texture(ma, tex)) { - GPU_drawobject_free(dm); - break; - } - } - } - } } } -static void world_changed(Main *bmain, World *wo) +static void world_changed(Main *UNUSED(bmain), World *wo) { - Material *ma; - /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&wo->id)); - /* glsl */ - for (ma = bmain->mat.first; ma; ma = ma->id.next) - if (ma->gpumaterial.first) - GPU_material_free(&ma->gpumaterial); + /* XXX temporary flag waiting for depsgraph proper tagging */ + wo->update_flag = 1; - if (defmaterial.gpumaterial.first) - GPU_material_free(&defmaterial.gpumaterial); - - if (wo->gpumaterial.first) - GPU_material_free(&wo->gpumaterial); + /* glsl */ + if (wo->id.recalc & ID_RECALC) { + if (!BLI_listbase_is_empty(&defmaterial.gpumaterial)) { + GPU_material_free(&defmaterial.gpumaterial); + } + if (!BLI_listbase_is_empty(&wo->gpumaterial)) { + GPU_material_free(&wo->gpumaterial); + } + } } static void image_changed(Main *bmain, Image *ima) @@ -503,41 +324,26 @@ static void image_changed(Main *bmain, Image *ima) static void scene_changed(Main *bmain, Scene *scene) { Object *ob; - Material *ma; - World *wo; /* glsl */ for (ob = bmain->object.first; ob; ob = ob->id.next) { - if (ob->gpulamp.first) - GPU_lamp_free(ob); - if (ob->mode & OB_MODE_TEXTURE_PAINT) { BKE_texpaint_slots_refresh_object(scene, ob); BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); - GPU_drawobject_free(ob->derivedFinal); } } - - for (ma = bmain->mat.first; ma; ma = ma->id.next) - if (ma->gpumaterial.first) - GPU_material_free(&ma->gpumaterial); - - for (wo = bmain->world.first; wo; wo = wo->id.next) - if (wo->gpumaterial.first) - GPU_material_free(&wo->gpumaterial); - - if (defmaterial.gpumaterial.first) - GPU_material_free(&defmaterial.gpumaterial); } -void ED_render_id_flush_update(Main *bmain, ID *id) +void ED_render_id_flush_update(const DEGEditorUpdateContext *update_ctx, ID *id) { /* this can be called from render or baking thread when a python script makes * changes, in that case we don't want to do any editor updates, and making * GPU changes is not possible because OpenGL only works in the main thread */ - if (!BLI_thread_is_main()) + if (!BLI_thread_is_main()) { return; - + } + Main *bmain = update_ctx->bmain; + /* Internal ID update handlers. */ switch (GS(id->name)) { case ID_MA: material_changed(bmain, (Material *)id); @@ -563,15 +369,4 @@ void ED_render_id_flush_update(Main *bmain, ID *id) render_engine_flag_changed(bmain, RE_ENGINE_UPDATE_OTHER); break; } - -} - - -void ED_render_internal_init(void) -{ - RenderEngineType *ret = RE_engines_find(RE_engine_id_BLENDER_RENDER); - - ret->view_update = render_view3d_update; - ret->view_draw = render_view3d_draw; - } diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index c43083a1616..12f9c8f40c1 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -91,8 +91,10 @@ static ScrArea *find_area_showing_r_result(bContext *C, Scene *scene, wmWindow * /* find an imagewindow showing render result */ for (*win = wm->windows.first; *win; *win = (*win)->next) { - if ((*win)->screen->scene == scene) { - for (sa = (*win)->screen->areabase.first; sa; sa = sa->next) { + if (WM_window_get_active_scene(*win) == scene) { + const bScreen *screen = WM_window_get_active_screen(*win); + + for (sa = screen->areabase.first; sa; sa = sa->next) { if (sa->spacetype == SPACE_IMAGE) { sima = sa->spacedata.first; if (sima->image && sima->image->type == IMA_TYPE_R_RESULT) @@ -248,7 +250,7 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) } /* test if we have a temp screen in front */ - if (win->screen->temp) { + if (WM_window_is_temp_screen(win)) { wm_window_lower(win); return OPERATOR_FINISHED; } @@ -294,7 +296,7 @@ static int render_view_show_invoke(bContext *C, wmOperator *op, const wmEvent *e wmWindow *wincur = CTX_wm_window(C); /* test if we have currently a temp screen active */ - if (wincur->screen->temp) { + if (WM_window_is_temp_screen(wincur)) { wm_window_lower(wincur); } else { @@ -303,8 +305,9 @@ static int render_view_show_invoke(bContext *C, wmOperator *op, const wmEvent *e /* is there another window on current scene showing result? */ for (win = CTX_wm_manager(C)->windows.first; win; win = win->next) { - bScreen *sc = win->screen; - if ((sc->temp && ((ScrArea *)sc->areabase.first)->spacetype == SPACE_IMAGE) || + const bScreen *sc = WM_window_get_active_screen(win); + + if ((WM_window_is_temp_screen(win) && ((ScrArea *)sc->areabase.first)->spacetype == SPACE_IMAGE) || (win == winshow && winshow != wincur)) { wm_window_raise(win); |