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

diff --git a/intern/boolop/intern/BOP_Merge2.cpp b/intern/boolop/intern/BOP_Merge2.cpp
index bbf3f8ba702a5e803666e9c3d21a6c130bc7dcac..f75fddc554e57fffe5c378ff757422f861399294 100644 (file)
--- 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 bef0906857e8caa72fea69c38a38d051d3629552..6e498a5fc29f14cc389222c826c1dd5938b6ed5f 100644 (file)
--- 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 0fcd9e910a74a5bad3caf3943597c1f8868e052f..deb56b286b441332313eaf657551d079f7acac90 100644 (file)
--- 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++;