Commit: 2654e9c9c1915a237201ec35f6c6794de66de770 Author: Jeroen Bakker Date: Fri Aug 28 14:41:36 2020 +0200 Branches: master https://developer.blender.org/rB2654e9c9c1915a237201ec35f6c6794de66de770
Fix T80141: Fix Compiling Workbench Volume Shaders (Mesa 20.0.8) Default mesa driver for ubuntu 20.04 fails when a name is defined twice. M_PI is defined in both `common_workbench_lib` and `common_math_lib`. This patch remove the define out of common_workbench_lib For reference it fails on https://github.com/mesa3d/mesa/blob/mesa-20.0.8/src/compiler/glsl/glcpp/glcpp-parse.y#L1186 during the check if the macros are the same. Reviewed By: Clément Foucault Differential Revision: https://developer.blender.org/D8741 =================================================================== M source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl =================================================================== diff --git a/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl index eb61edca6c7..122c99ca536 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl @@ -1,6 +1,5 @@ #define EPSILON 0.00001 -#define M_PI 3.14159265358979323846 #define CAVITY_BUFFER_RANGE 4.0 _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
