[Bf-blender-cvs] [d0e9352d32f] blender2.8: Depsgraph: Use explicit graph API for OpenGL render

[Sergey Sharybin]

Commit: d0e9352d32f6f28f09f98f0edfdfeaab82ca5309
Author: Sergey Sharybin
Date:   Fri Nov 3 17:57:46 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBd0e9352d32f6f28f09f98f0edfdfeaab82ca5309

Depsgraph: Use explicit graph API for OpenGL render

===================================================================

M       source/blender/editors/render/render_opengl.c

===================================================================

diff --git a/source/blender/editors/render/render_opengl.c 
b/source/blender/editors/render/render_opengl.c
index ec293c60d67..03cffa5a384 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -96,6 +96,7 @@ typedef struct OGLRender {
        Scene *scene;
        WorkSpace *workspace;
        SceneLayer *scene_layer;
+       Depsgraph *depsgraph;
 
        View3D *v3d;
        RegionView3D *rv3d;
@@ -666,6 +667,7 @@ static bool screen_opengl_render_init(bContext *C, 
wmOperator *op)
        oglrender->scene = scene;
        oglrender->workspace = workspace;
        oglrender->scene_layer = CTX_data_scene_layer(C);
+       oglrender->depsgraph = CTX_data_depsgraph(C);
        oglrender->cfrao = scene->r.cfra;
 
        oglrender->write_still = is_write_still && !is_animation;
@@ -811,7 +813,7 @@ static void screen_opengl_render_end(bContext *C, OGLRender 
*oglrender)
 
        if (oglrender->timer) { /* exec will not have a timer */
                scene->r.cfra = oglrender->cfrao;
-               BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene);
+               BKE_scene_graph_update_for_newframe(bmain->eval_ctx, 
oglrender->depsgraph, bmain, scene);
 
                WM_event_remove_timer(oglrender->wm, oglrender->win, 
oglrender->timer);
        }
@@ -1021,7 +1023,7 @@ static bool screen_opengl_render_anim_step(bContext *C, 
wmOperator *op)
        if (CFRA < oglrender->nfra)
                CFRA++;
        while (CFRA < oglrender->nfra) {
-               BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene);
+               BKE_scene_graph_update_for_newframe(bmain->eval_ctx, 
oglrender->depsgraph, bmain, scene);
                CFRA++;
        }
 
@@ -1043,11 +1045,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);
+       BKE_scene_graph_update_for_newframe(bmain->eval_ctx, 
oglrender->depsgraph, bmain, scene);
 
        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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs