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/render/extern | |
| parent | 2464dcef37f1a52db3c8a05922c0475fd3bff238 (diff) | |
| parent | b5fe00d1ac43c16ec8f74d3ad7689599dfb2ef00 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render/extern')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 0b392c122db..281f0082d7f 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -215,7 +215,7 @@ int multitex_nodes(struct Tex *tex, float texvec[3], float dxt[3], float dyt[3], const short thread, short which_output, struct ShadeInput *shi, struct MTex *mtex, struct ImagePool *pool); float RE_lamp_get_data(struct ShadeInput *shi, struct Object *lamp_obj, float col[4], float lv[3], float *dist, float shadow[4]); -void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *age, float *lifetime, float co[3], float *size, float vel[3], float angvel[3]); +void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *random, float *age, float *lifetime, float co[3], float *size, float vel[3], float angvel[3]); float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta); |