blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

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
This commit is contained in:
Jeroen Bakker 2020-08-28 14:41:36 +02:00 committed by Jeroen Bakker
parent 922aac999d
commit 2654e9c9c1
Notes: blender-bot 2023-02-14 09:29:42 +01:00 
Referenced by issue #82280, Quick Smoke Doesn't Work In Already Established Scene
Referenced by issue #80141, Crash when adding a Volume Object or Quick Smoke
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl
View File

@ -1,6 +1,5 @@
#define EPSILON 0.00001
#define M_PI 3.14159265358979323846
#define CAVITY_BUFFER_RANGE 4.0