diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 07:56:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 07:56:02 +0400 |
| commit | 92527b9264c8cca99282e7d7a2368dbf17aa4605 (patch) | |
| tree | dfc9480f523a9ad72e8577920f200afed81be94a /source/blender/gpu/intern/gpu_material.c | |
| parent | 6067fa682b0c70778f614ab68af20455befe5a76 (diff) | |
remove assert for poly_find_ear(), added recently but its incorrect, also minor style edits.
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 9319ac53db6..ed7a2f4ede0 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1126,10 +1126,12 @@ static void do_material_tex(GPUShadeInput *shi) else { /* otherwise use accumulated perturbations */ GPU_link(mat, "mtex_nspace_tangent", GPU_attribute(CD_TANGENT, ""), shi->vn, tnor, &newnor); } - } else if (mtex->normapspace == MTEX_NSPACE_OBJECT) { + } + else if (mtex->normapspace == MTEX_NSPACE_OBJECT) { /* transform normal by object then view matrix */ GPU_link(mat, "mtex_nspace_object", GPU_builtin(GPU_VIEW_MATRIX), GPU_builtin(GPU_OBJECT_MATRIX), tnor, &newnor); - } else if (mtex->normapspace == MTEX_NSPACE_WORLD) { + } + else if (mtex->normapspace == MTEX_NSPACE_WORLD) { /* transform normal by view matrix */ GPU_link(mat, "mtex_nspace_world", GPU_builtin(GPU_VIEW_MATRIX), tnor, &newnor); } |