diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/gpu | |
parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 9f1fdcfe551..b77847d6206 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -2038,7 +2038,7 @@ int GPU_scene_object_lights(SceneLayer *sl, float viewmat[4][4], int ortho) GPU_basic_shader_light_set(count, NULL); /* view direction for specular is not computed correct by default in - * opengl, so we set the settings ourselfs */ + * opengl, so we set the settings ourselves */ GPU_basic_shader_light_set_viewer(!ortho); int count = 0; |