diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-05 08:35:26 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-05 08:35:26 +0200 |
| commit | 3a2b0ab73d4cfbed769d46517f1f4832a975a979 (patch) | |
| tree | d62a72796aaa2a80e0a70b19d7bafac4d610a2b0 /servers/rendering/renderer_rd/storage_rd | |
| parent | 132a0e3242a54cd0750769b8f057ae8e0fd58232 (diff) | |
| parent | 2cea42cc7faf12ad56b12c113bbb70521264c8e8 (diff) | |
Merge pull request #66898 from aaronfranke/proj-mat-columns
Rename Projection `matrix` to `columns`
Diffstat (limited to 'servers/rendering/renderer_rd/storage_rd')
| -rw-r--r-- | servers/rendering/renderer_rd/storage_rd/material_storage.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/storage_rd/material_storage.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp index 36f1bc0316..626738d971 100644 --- a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp @@ -720,7 +720,7 @@ _FORCE_INLINE_ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataTy Projection v = value; for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - gui[i * 4 + j] = v.matrix[i][j]; + gui[i * 4 + j] = v.columns[i][j]; } } } diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.h b/servers/rendering/renderer_rd/storage_rd/material_storage.h index d496eed17a..330eac777f 100644 --- a/servers/rendering/renderer_rd/storage_rd/material_storage.h +++ b/servers/rendering/renderer_rd/storage_rd/material_storage.h @@ -302,7 +302,7 @@ public: static _FORCE_INLINE_ void store_camera(const Projection &p_mtx, float *p_array) { for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - p_array[i * 4 + j] = p_mtx.matrix[i][j]; + p_array[i * 4 + j] = p_mtx.columns[i][j]; } } } |