diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-24 14:51:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-24 14:51:45 +0400 |
commit | 8fdebf24f4fe405c77f13a72c45cf0f8e6bc1f3f (patch) | |
tree | e2b7d4d9f40b8f93afe15d25ef092b2242282637 /source/blender/blenkernel | |
parent | 5c4743b9ee2e98fc9ba8738fefddd7698034752d (diff) |
harmless changes to quiet clang static check warnings.
- made EXPANDED_AGRP take bAnimContext as an argument.
- remove unneeded NULL check drawFacesColored functions.
- comment some vars which are set but not used.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 0b29b29e60f..ee9d4963973 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -580,8 +580,9 @@ static void cdDM_drawFacesColored(DerivedMesh *dm, int useTwoSided, unsigned cha /* there's a conflict here... twosided colors versus culling...? */ /* defined by history, only texture faces have culling option */ /* we need that as mesh option builtin, next to double sided lighting */ - if(col1 && col2) + if(col2) { glEnable(GL_CULL_FACE); + } cdDM_update_normals_from_pbvh(dm); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index b9bf10bdf39..33094313acd 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1541,8 +1541,10 @@ static void ccgDM_drawFacesColored(DerivedMesh *dm, int UNUSED(useTwoSided), uns } glShadeModel(GL_SMOOTH); - if(col1 && col2) + + if(col2) { glEnable(GL_CULL_FACE); + } glBegin(GL_QUADS); for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) { diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index db07fae9245..ba5d4282416 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -2068,6 +2068,7 @@ void txt_do_redo(Text *text) linep= linep+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++; linep= linep+(text->undo_buf[text->undo_pos]<<16); text->undo_pos++; linep= linep+(text->undo_buf[text->undo_pos]<<24); text->undo_pos++; + (void)linep; break; case UNDO_INDENT: |