diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-05-21 13:20:36 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-05-21 13:20:36 +0300 |
| commit | cfe5232226c43f78782be02848cac64d3576ebcc (patch) | |
| tree | bfe6707ac9b1f8f45b2b872059e0fd40bed91e97 /source/blender/render/intern/engine.c | |
| parent | aa6817616c17d323fe5da79bba8590f6b2fb1c1d (diff) | |
| parent | ff51c2e89a0951d043a843435b4c25ba7a15e8e2 (diff) | |
Merge branch 'master' into temp-attributes-paneltemp-attributes-panel
Diffstat (limited to 'source/blender/render/intern/engine.c')
| -rw-r--r-- | source/blender/render/intern/engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c index 66d38eb19c7..306d144f79d 100644 --- a/source/blender/render/intern/engine.c +++ b/source/blender/render/intern/engine.c @@ -546,7 +546,7 @@ float RE_engine_get_camera_shift_x(RenderEngine *engine, Object *camera, bool us void RE_engine_get_camera_model_matrix(RenderEngine *engine, Object *camera, bool use_spherical_stereo, - float *r_modelmat) + float r_modelmat[16]) { /* When using spherical stereo, get model matrix without multiview, * leaving stereo to be handled by the engine. */ |