blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Merge branch 'blender-v2.82-release'

This commit is contained in:
Pablo Dobarro 2020-02-04 15:33:19 +01:00
parent 3685347b41 db4bb49aae
commit 6b9062508a
Notes: blender-bot 2023-02-14 08:42:53 +01:00 
Referenced by issue #73588, Blender doesn't respond while selecting system console and saving or opening another file
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/shaders/node_musgrave_texture.osl
View File

@ -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)

2
intern/cycles/render/nodes.cpp
View File

@ -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);

4
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -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);

2
source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
View File

@ -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, ""},