diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:19:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:20:50 +0300 |
| commit | 6b433f4eb3da0acf092fb4e5417b10f9b304d073 (patch) | |
| tree | 17d66beede9df8d8b43f9db39265649c2d72e732 /source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl | |
| parent | a7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff) | |
| parent | a4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl')
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl b/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl index 7dd460004ae..c9f2d64f30b 100644 --- a/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl @@ -119,7 +119,7 @@ void prepare_raycast( #define prev_delta times_and_deltas.w // #define GROUPED_FETCHES /* is still slower, need to see where is the bottleneck. */ -/* Return the hit position, and negate the z component (making it positive) if not hit occured. */ +/* Return the hit position, and negate the z component (making it positive) if not hit occurred. */ /* __ray_dir__ is the ray direction premultiplied by it's maximum length */ vec3 raycast( int index, vec3 ray_origin, vec3 ray_dir, float thickness, float ray_jitter, |