From 0ba0993f18c135f260a8278a911185452011fea4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 3 Nov 2017 14:36:49 +0100 Subject: Depsgraph: Port more areas to direct depsgraph API This is a lots of changes, but they are boiling down to a simple API changes where we are no longer relying on implicit usage of scene's depsgraph and pass depsgraph explicitly. There should be no user measurable difference, render_layer* tests are also passing. --- source/blender/editors/include/ED_screen.h | 3 ++- source/blender/editors/physics/dynamicpaint_ops.c | 6 ++++-- source/blender/editors/physics/physics_fluid.c | 6 ++++-- source/blender/editors/render/render_internal.c | 10 ++++++++-- source/blender/editors/scene/scene_edit.c | 4 +++- source/blender/editors/screen/screen_edit.c | 4 ++-- source/blender/editors/screen/screen_ops.c | 2 +- source/blender/editors/space_clip/tracking_ops_track.c | 3 ++- source/blender/editors/space_view3d/view3d_view.c | 2 +- 9 files changed, 27 insertions(+), 13 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 93786a484f2..8a1c7239955 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -39,6 +39,7 @@ #include "BLI_compiler_attrs.h" +struct Depsgraph; struct wmWindowManager; struct wmWindow; struct wmNotifier; @@ -163,7 +164,7 @@ bool ED_workspace_layout_cycle( struct bContext *C) ATTR_NONNULL(); /* anim */ -void ED_update_for_newframe(struct Main *bmain, struct Scene *scene); +void ED_update_for_newframe(struct Main *bmain, struct Scene *scene, struct Depsgraph *depsgraph); void ED_refresh_viewport_fps(struct bContext *C); int ED_screen_animation_play(struct bContext *C, int sync, int mode); diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index 7de94be0c7a..210d8351945 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -289,6 +289,7 @@ typedef struct DynamicPaintBakeJob { struct Main *bmain; Scene *scene; SceneLayer *scene_layer; + Depsgraph *depsgraph; Object *ob; DynamicPaintSurface *surface; @@ -364,7 +365,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job) frame = surface->start_frame; orig_frame = scene->r.cfra; scene->r.cfra = (int)frame; - ED_update_for_newframe(job->bmain, scene); + ED_update_for_newframe(job->bmain, scene, job->depsgraph); /* Init surface */ if (!dynamicPaint_createUVSurface(scene, surface, job->progress, job->do_update)) { @@ -390,7 +391,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job) /* calculate a frame */ scene->r.cfra = (int)frame; - ED_update_for_newframe(job->bmain, scene); + ED_update_for_newframe(job->bmain, scene, job->depsgraph); if (!dynamicPaint_calculateFrame(surface, job->eval_ctx, scene, cObject, frame)) { job->success = 0; return; @@ -491,6 +492,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op) job->bmain = CTX_data_main(C); job->scene = scene; job->scene_layer = sl; + job->depsgraph = CTX_data_depsgraph(C); job->ob = ob; job->canvas = canvas; job->surface = surface; diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 060ac046ba1..a5e92802c6f 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -332,6 +332,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid { Scene *scene = CTX_data_scene(C); SceneLayer *sl = CTX_data_scene_layer(C); + Depsgraph *depsgraph = CTX_data_depsgraph(C); EvaluationContext eval_ctx; Base *base; int i; @@ -408,7 +409,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid /* Modifying the global scene isn't nice, but we can do it in * this part of the process before a threaded job is created */ scene->r.cfra = (int)eval_time; - ED_update_for_newframe(CTX_data_main(C), scene); + ED_update_for_newframe(CTX_data_main(C), scene, depsgraph); /* now scene data should be current according to animation system, so we fill the channels */ @@ -846,6 +847,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor { Scene *scene = CTX_data_scene(C); SceneLayer *sl = CTX_data_scene_layer(C); + Depsgraph *depsgraph = CTX_data_depsgraph(C); int i; FluidsimSettings *domainSettings; @@ -957,7 +959,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor /* reset to original current frame */ scene->r.cfra = origFrame; - ED_update_for_newframe(CTX_data_main(C), scene); + ED_update_for_newframe(CTX_data_main(C), scene, depsgraph); /* ******** init domain object's matrix ******** */ copy_m4_m4(domainMat, fsDomain->obmat); diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 77381b43b22..61ff9264e95 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -102,6 +102,10 @@ typedef struct RenderJob { Main *main; Scene *scene; 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; @@ -338,7 +342,7 @@ static int screen_render_exec(bContext *C, wmOperator *op) RE_SetReports(re, NULL); // no redraw needed, we leave state as we entered it - ED_update_for_newframe(mainp, scene); + ED_update_for_newframe(mainp, scene, CTX_data_depsgraph(C)); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene); @@ -652,7 +656,7 @@ static void render_endjob(void *rjv) 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); + ED_update_for_newframe(G.main, rj->scene, rj->depsgraph); } } @@ -915,6 +919,8 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even rj->main = mainp; rj->scene = scene; rj->current_scene = rj->scene; + /* TODO(sergey): Render engine should be using own depsgraph. */ + rj->depsgraph = CTX_data_depsgraph(C); rj->srl = srl; rj->camera_override = camera_override; rj->lay_override = 0; diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 061a783930d..1bbc6b3e91a 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -124,15 +124,17 @@ void ED_scene_changed_update(Main *bmain, bContext *C, Scene *scene_new, const b * but workspace should remember the last one set. Could store render-layer * per window-workspace combination (using WorkSpaceDataRelation) */ SceneLayer *layer_new = BLI_findlink(&scene_new->render_layers, scene_new->active_layer); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene_new, layer_new); CTX_data_scene_set(C, scene_new); BKE_workspace_render_layer_set(CTX_wm_workspace(C), layer_new); BKE_scene_set_background(bmain, scene_new); + DEG_graph_relations_update(depsgraph, bmain, scene_new); DEG_on_visible_update(bmain, false); ED_screen_update_after_scene_change(active_screen, scene_new); ED_render_engine_changed(bmain); - ED_update_for_newframe(bmain, scene_new); + ED_update_for_newframe(bmain, scene_new, depsgraph); /* complete redraw */ WM_event_add_notifier(C, NC_WINDOW, NULL); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index e6bdd0e83b5..5e0afe0ec39 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1726,7 +1726,7 @@ void ED_screen_animation_timer_update(bScreen *screen, int redraws, int refresh) } /* results in fully updated anim system */ -void ED_update_for_newframe(Main *bmain, Scene *scene) +void ED_update_for_newframe(Main *bmain, Scene *scene, struct Depsgraph *depsgraph) { #ifdef DURIAN_CAMERA_SWITCH void *camera = BKE_scene_camera_switch_find(scene); @@ -1743,7 +1743,7 @@ void ED_update_for_newframe(Main *bmain, Scene *scene) ED_clip_update_frame(bmain, scene->r.cfra); /* this function applies the changes too */ - BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene); /* composite */ if (scene->use_nodes && scene->nodetree) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 4f89fd45a6b..9352fcc76f7 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3518,7 +3518,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv } /* since we follow drawflags, we can't send notifier but tag regions ourselves */ - ED_update_for_newframe(bmain, scene); + ED_update_for_newframe(bmain, scene, CTX_data_depsgraph(C)); for (window = wm->windows.first; window; window = window->next) { const bScreen *win_screen = WM_window_get_active_screen(window); diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c index 755cda94128..cd8e92c9b9c 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.c +++ b/source/blender/editors/space_clip/tracking_ops_track.c @@ -297,7 +297,8 @@ static void track_markers_endjob(void *tmv) tmj->scene->r.cfra = BKE_movieclip_remap_clip_to_scene_frame(tmj->clip, tmj->lastfra); if (wm != NULL) { - ED_update_for_newframe(tmj->main, tmj->scene); + // XXX: ... + // ED_update_for_newframe(tmj->main, tmj->scene); } BKE_autotrack_context_sync(tmj->context); diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 991c61a77cc..4588f5c60ca 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1574,7 +1574,7 @@ static int game_engine_exec(bContext *C, wmOperator *op) //XXX restore_all_scene_cfra(scene_cfra_store); BKE_scene_set_background(CTX_data_main(C), startscene); - //XXX BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene); + //XXX BKE_scene_graph_update_for_newframe(bmain->eval_ctx, bmain, scene, depsgraph); BLI_callback_exec(bmain, &startscene->id, BLI_CB_EVT_GAME_POST); -- cgit v1.2.3