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/gpu/shaders | |
parent | 2464dcef37f1a52db3c8a05922c0475fd3bff238 (diff) | |
parent | b5fe00d1ac43c16ec8f74d3ad7689599dfb2ef00 (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 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 0a97cdc693a..7acd9aa1fd5 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -238,16 +238,18 @@ void geom( } void particle_info( - vec4 sprops, vec3 loc, vec3 vel, vec3 avel, - out float random, out float age, out float life_time, out vec3 location, + vec4 sprops, vec4 loc, vec3 vel, vec3 avel, + out float index, out float random, out float age, + out float life_time, out vec3 location, out float size, out vec3 velocity, out vec3 angular_velocity) { - random = sprops.x; + index = sprops.x; + random = loc.w; age = sprops.y; life_time = sprops.z; size = sprops.w; - location = loc; + location = loc.xyz; velocity = vel; angular_velocity = avel; } |