diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
| commit | 8a6604f253e22bbade3dcf60b9a1c437ace44151 (patch) | |
| tree | fee875d0a0b09fbe0df52aa83094159144048205 /source/blender/render/RE_engine.h | |
| parent | edf1b833674a6e54df7a16c14f0c6193fbbb482e (diff) | |
| parent | afec66c024dc2b75447537d45406c06342ec201e (diff) | |
Merge branch 'master' into temp-gpencil-maskingtemp-gpencil-masking
Conflicts:
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/render/RE_engine.h')
| -rw-r--r-- | source/blender/render/RE_engine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/RE_engine.h b/source/blender/render/RE_engine.h index f6ab7fd9d3c..7352ac7b12e 100644 --- a/source/blender/render/RE_engine.h +++ b/source/blender/render/RE_engine.h @@ -195,7 +195,7 @@ float RE_engine_get_camera_shift_x(RenderEngine *engine, void RE_engine_get_camera_model_matrix(RenderEngine *engine, struct Object *camera, bool use_spherical_stereo, - float *r_modelmat); + float r_modelmat[16]); bool RE_engine_get_spherical_stereo(RenderEngine *engine, struct Object *camera); bool RE_engine_test_break(RenderEngine *engine); |