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/gpu/shaders | |
parent | 618bc6c67954f80b3c0c0332f44648b3187c23ca (diff) | |
parent | f6107af4cf4d907495e2e9c18e5866fd1d420650 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 667972fc429..0a97cdc693a 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -239,10 +239,10 @@ void geom( void particle_info( vec4 sprops, vec3 loc, vec3 vel, vec3 avel, - out float index, out float age, out float life_time, out vec3 location, + out float random, out float age, out float life_time, out vec3 location, out float size, out vec3 velocity, out vec3 angular_velocity) { - index = sprops.x; + random = sprops.x; age = sprops.y; life_time = sprops.z; size = sprops.w; |