diff options
| author | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
| commit | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (patch) | |
| tree | e3cebba97261f567f461769d891aa77707b57bd7 /progs/objviewer/glm.h | |
| parent | faa14818856e1e9a4ee624c2bc04d7aecabd07ab (diff) | |
| parent | a80e33f40731f07e8a39896bfdcd1b1504aedc1f (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/util/u_tile.c
src/gallium/auxiliary/util/u_tile.h
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'progs/objviewer/glm.h')
| -rw-r--r-- | progs/objviewer/glm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/objviewer/glm.h b/progs/objviewer/glm.h index 8740b3684df..1a5646fa4c7 100644 --- a/progs/objviewer/glm.h +++ b/progs/objviewer/glm.h @@ -153,7 +153,7 @@ glmFacetNormals(GLMmodel* model); /* glmVertexNormals: Generates smooth vertex normals for a model. * First builds a list of all the triangles each vertex is in. Then - * loops through each vertex in the the list averaging all the facet + * loops through each vertex in the list averaging all the facet * normals of the triangles each vertex is in. Finally, sets the * normal index in the triangle for the vertex to the generated smooth * normal. If the dot product of a facet normal and the facet normal |