diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-14 17:16:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-14 17:16:50 +0300 |
| commit | 3102bf28890c06b03cf7455604ec00fd1e27e89c (patch) | |
| tree | 47e0d1c09f146a51fc19e855c1fa2600db369787 /source/blender/nodes | |
| parent | 618bc6c67954f80b3c0c0332f44648b3187c23ca (diff) | |
| parent | f6107af4cf4d907495e2e9c18e5866fd1d420650 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_hair_info.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_particle_info.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_hair_info.c b/source/blender/nodes/shader/nodes/node_shader_hair_info.c index 5fe74976c08..6a15c59aa5b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_hair_info.c +++ b/source/blender/nodes/shader/nodes/node_shader_hair_info.c @@ -33,7 +33,7 @@ static bNodeSocketTemplate outputs[] = { { SOCK_FLOAT, 0, N_("Thickness"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, { SOCK_VECTOR, 0, N_("Tangent Normal"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, /*{ SOCK_FLOAT, 0, N_("Fade"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},*/ - { SOCK_FLOAT, 0, "Index" }, + { SOCK_FLOAT, 0, N_("Random") }, { -1, 0, "" } }; diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.c b/source/blender/nodes/shader/nodes/node_shader_particle_info.c index 8bdc88292e7..24f0474a5b8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_particle_info.c +++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c @@ -29,7 +29,7 @@ #include "RE_shader_ext.h" static bNodeSocketTemplate outputs[] = { - { SOCK_FLOAT, 0, "Index" }, + { SOCK_FLOAT, 0, "Random" }, { SOCK_FLOAT, 0, "Age" }, { SOCK_FLOAT, 0, "Lifetime" }, { SOCK_VECTOR, 0, "Location" }, |