diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-09 01:27:11 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-09 01:27:11 +0300 |
| commit | e2d04229c38b16e340f66c9e106e49277b2186e3 (patch) | |
| tree | ba3abc90334b229bc2406d2f4bae1b18e1c78694 /source/blender/draw/intern/draw_manager_exec.c | |
| parent | 1a99b6fc7e8e2d670bc5ceed23ecc84020a10555 (diff) | |
DRW: Remove support for NormalMatrix
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 51ec38088c3..d0faed8e261 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -792,7 +792,7 @@ static void draw_matrices_model_prepare(DRWCallState *st) return; } /* Order matters */ - if (st->matflag & (DRW_CALL_MODELVIEW | DRW_CALL_MODELVIEWINVERSE | DRW_CALL_NORMALVIEW)) { + if (st->matflag & (DRW_CALL_MODELVIEW | DRW_CALL_MODELVIEWINVERSE)) { mul_m4_m4m4(st->modelview, DST.view_data.matstate.mat[DRW_MAT_VIEW], st->model); } if (st->matflag & DRW_CALL_MODELVIEWINVERSE) { @@ -801,11 +801,6 @@ static void draw_matrices_model_prepare(DRWCallState *st) if (st->matflag & DRW_CALL_MODELVIEWPROJECTION) { mul_m4_m4m4(st->modelviewprojection, DST.view_data.matstate.mat[DRW_MAT_PERS], st->model); } - if (st->matflag & (DRW_CALL_NORMALVIEW)) { - copy_m3_m4(st->normalview, st->modelview); - invert_m3(st->normalview); - transpose_m3(st->normalview); - } } static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call) @@ -836,10 +831,6 @@ static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call) 1, (float *)state->modelviewprojection); } - if (shgroup->normalview != -1) { - GPU_shader_uniform_vector( - shgroup->shader, shgroup->normalview, 9, 1, (float *)state->normalview); - } if (shgroup->objectinfo != -1) { float objectinfo[4]; objectinfo[0] = state->objectinfo[0]; @@ -854,7 +845,6 @@ static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call) } } else { - BLI_assert((shgroup->normalview == -1)); /* For instancing and batching. */ float unitmat[4][4]; unit_m4(unitmat); |