diff options
| -rw-r--r-- | intern/cycles/kernel/shaders/node_musgrave_texture.osl | 2 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 4 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c | 2 |
4 files changed, 4 insertions, 6 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 bdab2a99897..00f4a7283bb 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1350,7 +1350,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/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 2bc36be42ab..015657318b2 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4086,9 +4086,7 @@ SculptPoseIKChain *sculpt_pose_ik_chain_init(Sculpt *sd, const float radius) { - float chain_end[3]; - float chain_segment_len = len_v3v3(initial_location, chain_end) / br->pose_ik_segments; - chain_segment_len = radius * (1.0f + br->pose_offset); + const float chain_segment_len = radius * (1.0f + br->pose_offset); float next_chain_segment_target[3]; int totvert = sculpt_vertex_count_get(ss); 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, ""}, |