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/GPU_material.h | |
| parent | 2464dcef37f1a52db3c8a05922c0475fd3bff238 (diff) | |
| parent | b5fe00d1ac43c16ec8f74d3ad7689599dfb2ef00 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 698f3ada2a3..e2f40ff5c54 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -357,10 +357,9 @@ void GPU_zenith_update_color(float color[3]); struct GPUParticleInfo { float scalprops[4]; - float location[3]; + float location[4]; float velocity[3]; float angular_velocity[3]; - int random_id; }; #ifdef WITH_OPENSUBDIV |