Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2021-01-26 19:40:35 +0300
committerRichard Antalik <richardantalik@gmail.com>2021-01-26 19:50:44 +0300
commit41979fc03b93ba8d55002311569536bf8c9ee983 (patch)
treeae441191f2e23084c168b24c4f1414529183ac1b /source/blender/draw/engines/workbench/workbench_effect_dof.c
parent981380cf6d086517cc1b5dfc60e9bde6253e5bd7 (diff)
Fix T84160: Wrong DOF when camera is overriden
Workbench engine used active camera to setup DOF effect even when camera was overridden. Store camera override in `WORKBENCH_PrivateData` and use it in `workbench_dof_engine_init()` Reviewed By: brecht Differential Revision: https://developer.blender.org/D9952
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_effect_dof.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_effect_dof.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c
index fcee8c270dd..73cd501190f 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c
@@ -133,14 +133,14 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata)
const DRWContextState *draw_ctx = DRW_context_state_get();
RegionView3D *rv3d = draw_ctx->rv3d;
View3D *v3d = draw_ctx->v3d;
- Scene *scene = draw_ctx->scene;
+
Object *camera;
if (v3d && rv3d) {
camera = (rv3d->persp == RV3D_CAMOB) ? v3d->camera : NULL;
}
else {
- camera = scene->camera;
+ camera = wpd->cam_original_ob;
}
Camera *cam = camera != NULL ? camera->data : NULL;