diff options
| author | Kent Mein <mein@cs.umn.edu> | 2008-12-03 20:36:30 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2008-12-03 20:36:30 +0300 |
| commit | edc06b0b5b949ca1982d729a19e1ee0c6e9f155d (patch) | |
| tree | 4f14e494c4d6ebaca9c0bf43f4b553f63c5956cb | |
| parent | 4e6b6dd3f91b837b81eaf44b8ea5b1652fd3bfea (diff) | |
A couple of small fixes to clear up some warnings.
BOP_Merge2.cpp
had same variable name at different scopes so I renamed a couple.
resources.c
added include that was missing. (This maybe was going to move? the old one
was commented out)
ed_markers.c
initalized a var that needed it.
Kent
| -rw-r--r-- | intern/boolop/intern/BOP_Merge2.cpp | 8 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_time/ed_markers.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/intern/boolop/intern/BOP_Merge2.cpp b/intern/boolop/intern/BOP_Merge2.cpp index bbf3f8ba702..f75fddc554e 100644 --- a/intern/boolop/intern/BOP_Merge2.cpp +++ b/intern/boolop/intern/BOP_Merge2.cpp @@ -294,8 +294,8 @@ void BOP_Merge2::cleanup( void ) BOP_Vertexs v = m_mesh->getVertexs(); for( BOP_IT_Vertexs it = v.begin(); it != v.end(); ++it ) { if( (*it)->getTAG() != BROKEN) { - BOP_Indexs edges = (*it)->getEdges(); - for(BOP_IT_Indexs i = edges.begin();i!=edges.end();i++) + BOP_Indexs iedges = (*it)->getEdges(); + for(BOP_IT_Indexs i = iedges.begin();i!=iedges.end();i++) if( m_mesh->getEdge((*i))->getUsed( ) == false) (*it)->removeEdge( *i ); if( (*it)->getEdges().size() == 0 ) (*it)->setTAG(BROKEN); } @@ -432,8 +432,8 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) vert->setTAG(BROKEN); for(BOP_IT_Indexs it = edges.begin(); it != edges.end(); ++it ) { - BOP_Edge *edge = m_mesh->getEdge(*it); - edge->setUsed(false); + BOP_Edge *tedge = m_mesh->getEdge(*it); + tedge->setUsed(false); } didMerge = true; } diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index bef0906857e..6e498a5fc29 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -53,6 +53,7 @@ #include "BIF_gl.h" #include "UI_resources.h" +#include "UI_interface_icons.h" //#include "UI_icons.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/space_time/ed_markers.c b/source/blender/editors/space_time/ed_markers.c index 0fcd9e910a7..deb56b286b4 100644 --- a/source/blender/editors/space_time/ed_markers.c +++ b/source/blender/editors/space_time/ed_markers.c @@ -254,7 +254,8 @@ static int ed_marker_move_init(bContext *C, wmOperator *op) ListBase *markers= context_get_markers(C); MarkerMove *mm; TimeMarker *marker; - int totmark, a; + int totmark=0; + int a; for (marker= markers->first; marker; marker= marker->next) if (marker->flag & SELECT) totmark++; |