[Bf-blender-cvs] [905921d2b52] blender2.8: Fix function using same local variable name as output variable
Clément Foucault
noreply at git.blender.org
Fri Oct 19 18:13:29 CEST 2018
Commit: 905921d2b524c2657a727a5c3b8799e7d6e28161
Author: Clément Foucault
Date: Fri Oct 19 15:06:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB905921d2b524c2657a727a5c3b8799e7d6e28161
Fix function using same local variable name as output variable
This may fix issues with certain compiler.
===================================================================
M source/blender/draw/modes/shaders/overlay_face_wireframe_geom.glsl
===================================================================
diff --git a/source/blender/draw/modes/shaders/overlay_face_wireframe_geom.glsl b/source/blender/draw/modes/shaders/overlay_face_wireframe_geom.glsl
index 742bcab80c0..8abb6ecc737 100644
--- a/source/blender/draw/modes/shaders/overlay_face_wireframe_geom.glsl
+++ b/source/blender/draw/modes/shaders/overlay_face_wireframe_geom.glsl
@@ -50,11 +50,11 @@ vec3 get_barycentric(bvec3 do_edge, const int v)
int v_n = v;
int v_n1 = (v + 1) % 3;
int v_n2 = (v + 2) % 3;
- vec3 barycentric;
- barycentric[v_n] = do_edge[v_n] ? 0.0 : 1.0;
- barycentric[v_n1] = 1.0;
- barycentric[v_n2] = do_edge[v_n2] ? 0.0 : 1.0;
- return barycentric;
+ vec3 bary;
+ bary[v_n] = do_edge[v_n] ? 0.0 : 1.0;
+ bary[v_n1] = 1.0;
+ bary[v_n2] = do_edge[v_n2] ? 0.0 : 1.0;
+ return bary;
}
void main(void)
More information about the Bf-blender-cvs
mailing list