archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Use explicit graph API for OpenGL render

Browse Source
This commit is contained in:
Sergey Sharybin
2017-11-03 17:57:46 +01:00
parent bb3024ef12
commit d0e9352d32
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/render/render_opengl.c
View File

@@ -96,6 +96,7 @@ typedef struct OGLRender {
Scene *scene; Scene *scene;
WorkSpace *workspace; WorkSpace *workspace;
SceneLayer *scene_layer; SceneLayer *scene_layer;
Depsgraph *depsgraph;
View3D *v3d; View3D *v3d;
RegionView3D *rv3d; RegionView3D *rv3d;
@@ -666,6 +667,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
oglrender->scene = scene; oglrender->scene = scene;
oglrender->workspace = workspace; oglrender->workspace = workspace;
oglrender->scene_layer = CTX_data_scene_layer(C); oglrender->scene_layer = CTX_data_scene_layer(C);
oglrender->depsgraph = CTX_data_depsgraph(C);
oglrender->cfrao = scene->r.cfra; oglrender->cfrao = scene->r.cfra;
oglrender->write_still = is_write_still && !is_animation; 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 */ if (oglrender->timer) { /* exec will not have a timer */
scene->r.cfra = oglrender->cfrao; 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); 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) if (CFRA < oglrender->nfra)
CFRA++; CFRA++;
while (CFRA < oglrender->nfra) { 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++; CFRA++;
} }
@@ -1043,11 +1045,11 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
WM_cursor_time(oglrender->win, scene->r.cfra); 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 (view_context) {
if (oglrender->rv3d->persp == RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) { 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 */ * then ED_update_for_newframe() the camera needs to be set */
if (BKE_scene_camera_switch_update(scene)) { if (BKE_scene_camera_switch_update(scene)) {
oglrender->v3d->camera = scene->camera; oglrender->v3d->camera = scene->camera;