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/intern/draw_manager_exec.c | |
parent | a7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff) | |
parent | a4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
-rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 3180cf5c459..938dda2eec9 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -788,7 +788,7 @@ static void draw_matrices_model_prepare(DRWCallState *st) /* set eye vector, transformed to object coords */ mul_m3_v3(tmp, st->eyevec); } - /* Non view dependant */ + /* Non view dependent */ if (st->matflag & DRW_CALL_MODELINVERSE) { invert_m4_m4(st->modelinverse, st->model); st->matflag &= ~DRW_CALL_MODELINVERSE; @@ -908,7 +908,7 @@ static void bind_ubo(GPUUniformBuffer *ubo, char bind_type) /* printf so user can report bad behaviour */ printf("Not enough ubo slots! This should not happen!\n"); /* This is not depending on user input. - * It is our responsability to make sure there is enough slots. */ + * It is our responsibility to make sure there is enough slots. */ BLI_assert(0); } slot_flags[bind_num] = bind_type; |