[Bf-blender-cvs] [af34c13da4e] master: Cleanup: Remove data duplication from large array in eevee_camera.hh

Jesse Yurkovich noreply at git.blender.org
Sun Oct 9 09:37:37 CEST 2022


Commit: af34c13da4e4566d62c60a7c6aec33f4481bed3c
Author: Jesse Yurkovich
Date:   Sun Oct 9 00:34:59 2022 -0700
Branches: master
https://developer.blender.org/rBaf34c13da4e4566d62c60a7c6aec33f4481bed3c

Cleanup: Remove data duplication from large array in eevee_camera.hh

Use `inline constexpr` instead of `static const` to prevent these
variables from being duplicated in each translation unit that includes
the eevee_camera.hh header (was included into 17 different object files
with MSVC).

Differential Revision: https://developer.blender.org/D16200

===================================================================

M	source/blender/draw/engines/eevee_next/eevee_camera.hh

===================================================================

diff --git a/source/blender/draw/engines/eevee_next/eevee_camera.hh b/source/blender/draw/engines/eevee_next/eevee_camera.hh
index aaef0f5898d..c1d65dbf31e 100644
--- a/source/blender/draw/engines/eevee_next/eevee_camera.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_camera.hh
@@ -13,7 +13,7 @@ namespace blender::eevee {
 
 class Instance;
 
-static const float cubeface_mat[6][4][4] = {
+inline constexpr float cubeface_mat[6][4][4] = {
     /* Pos X */
     {{0.0f, 0.0f, -1.0f, 0.0f},
      {0.0f, -1.0f, 0.0f, 0.0f},



More information about the Bf-blender-cvs mailing list