diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-14 23:49:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-14 23:49:13 +0300 |
| commit | e6386ed286f2e0d7a68772a24e7979b45c1c5ad7 (patch) | |
| tree | 42f188bff5016f84f4e55c690bf1d134e5dc3cc4 /source/blender/nodes | |
| parent | 2464dcef37f1a52db3c8a05922c0475fd3bff238 (diff) | |
| parent | b5fe00d1ac43c16ec8f74d3ad7689599dfb2ef00 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_particle_info.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 24f0474a5b8..69fcbba8f88 100644 --- a/source/blender/nodes/shader/nodes/node_shader_particle_info.c +++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c @@ -29,6 +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" }, @@ -45,7 +46,7 @@ static void node_shader_exec_particle_info(void *data, int UNUSED(thread), bNode { ShadeInput *shi = ((ShaderCallData *)data)->shi; - RE_instance_get_particle_info(shi->obi, out[0]->vec, out[1]->vec, out[2]->vec, out[3]->vec, out[4]->vec, out[5]->vec, out[6]->vec); + RE_instance_get_particle_info(shi->obi, out[0]->vec, out[1]->vec, out[2]->vec, out[3]->vec, out[4]->vec, out[5]->vec, out[6]->vec, out[7]->vec); } static int gpu_shader_particle_info(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out) |