archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-02-14 15:16:50 +01:00
parent 618bc6c679 f6107af4cf
commit 3102bf2889
26 changed files with 220 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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