[Bf-blender-cvs] [3a0b22b2dae] master: Fix T69532: Wave texture fails with a compile error.

OmarSquircleArt noreply at git.blender.org
Thu Sep 5 13:27:26 CEST 2019


Commit: 3a0b22b2daea4d255063cbb8f6269b8a764618d4
Author: OmarSquircleArt
Date:   Thu Sep 5 13:25:13 2019 +0200
Branches: master
https://developer.blender.org/rB3a0b22b2daea4d255063cbb8f6269b8a764618d4

Fix T69532: Wave texture fails with a compile error.

`noise_turbulence` was renamed to `fractal_noise`.

Reviewers: brecht

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

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

M	source/blender/gpu/shaders/material/gpu_shader_material_tex_wave.glsl

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

diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_tex_wave.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_tex_wave.glsl
index 2196848a4ef..fa79e3dc310 100644
--- a/source/blender/gpu/shaders/material/gpu_shader_material_tex_wave.glsl
+++ b/source/blender/gpu/shaders/material/gpu_shader_material_tex_wave.glsl
@@ -11,7 +11,7 @@ float calc_wave(
   }
 
   if (distortion != 0.0) {
-    n += distortion * noise_turbulence(p * detail_scale, detail, 0);
+    n += distortion * fractal_noise(p * detail_scale, detail);
   }
 
   if (wave_profile == 0) { /* profile sin */



More information about the Bf-blender-cvs mailing list