diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 16:36:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 16:36:49 +0300 |
| commit | 0ba0993f18c135f260a8278a911185452011fea4 (patch) | |
| tree | 4463c50e403116c17f1753cd8100cd9aa076a306 /source/blender/editors/screen | |
| parent | 95ccaed9e652f20a97d0a4d63ac3c9825944c897 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 |
2 files changed, 3 insertions, 3 deletions
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); |