From 842e71a1ef9fd91e1680f513ec5860cfc8707f4c Mon Sep 17 00:00:00 2001 From: Bartosz Moniewski Date: Tue, 4 Feb 2020 13:39:02 +0100 Subject: [PATCH] Fix wrong default value for Lacunarity in Musgrave texture Lacunarity parameter determines scaling of subsequent octaves in fractal noises. For example, Noise node have this scaling hardcoded to 2.0. Each octave have twice bigger scale than previous one, resulting in finer details. By design fractal noises that generate octaves with same seed should not have Lacunarity set to 1.0, since then it just stacks up identical noises. Differential Revision: https://developer.blender.org/D6742 --- intern/cycles/kernel/shaders/node_musgrave_texture.osl | 2 +- intern/cycles/render/nodes.cpp | 2 +- source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/intern/cycles/kernel/shaders/node_musgrave_texture.osl b/intern/cycles/kernel/shaders/node_musgrave_texture.osl index 8861f9a671a..d23ecfd4a31 100644 --- a/intern/cycles/kernel/shaders/node_musgrave_texture.osl +++ b/intern/cycles/kernel/shaders/node_musgrave_texture.osl @@ -691,7 +691,7 @@ shader node_musgrave_texture( float Dimension = 2.0, float Scale = 5.0, float Detail = 2.0, - float Lacunarity = 1.0, + float Lacunarity = 2.0, float Offset = 0.0, float Gain = 1.0, output float Fac = 0.0) diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index e4339b40744..c241c7b0df0 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1347,7 +1347,7 @@ NODE_DEFINE(MusgraveTextureNode) SOCKET_IN_FLOAT(scale, "Scale", 1.0f); SOCKET_IN_FLOAT(detail, "Detail", 2.0f); SOCKET_IN_FLOAT(dimension, "Dimension", 2.0f); - SOCKET_IN_FLOAT(lacunarity, "Lacunarity", 1.0f); + SOCKET_IN_FLOAT(lacunarity, "Lacunarity", 2.0f); SOCKET_IN_FLOAT(offset, "Offset", 0.0f); SOCKET_IN_FLOAT(gain, "Gain", 1.0f); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c index 56e102a118d..ad6aa4a710c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c @@ -27,7 +27,7 @@ static bNodeSocketTemplate sh_node_tex_musgrave_in[] = { {SOCK_FLOAT, 1, N_("Scale"), 5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f}, {SOCK_FLOAT, 1, N_("Detail"), 2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 16.0f}, {SOCK_FLOAT, 1, N_("Dimension"), 2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f}, - {SOCK_FLOAT, 1, N_("Lacunarity"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f}, + {SOCK_FLOAT, 1, N_("Lacunarity"), 2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f}, {SOCK_FLOAT, 1, N_("Offset"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f}, {SOCK_FLOAT, 1, N_("Gain"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f}, {-1, 0, ""},