[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17697] branches/blender2.5/blender: A couple of small fixes to clear up some warnings.

[Kent Mein]

Revision: 17697
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17697
Author:   sirdude
Date:     2008-12-03 18:36:30 +0100 (Wed, 03 Dec 2008)

Log Message:
-----------
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

Modified Paths:
--------------
    branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp
    branches/blender2.5/blender/source/blender/editors/interface/resources.c
    branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c

Modified: branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp
===================================================================
--- branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp	2008-12-03 17:11:50 UTC (rev 17696)
+++ branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp	2008-12-03 17:36:30 UTC (rev 17697)
@@ -294,8 +294,8 @@
 	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 @@
 					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;
 				}	

Modified: branches/blender2.5/blender/source/blender/editors/interface/resources.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/resources.c	2008-12-03 17:11:50 UTC (rev 17696)
+++ branches/blender2.5/blender/source/blender/editors/interface/resources.c	2008-12-03 17:36:30 UTC (rev 17697)
@@ -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"

Modified: branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c	2008-12-03 17:11:50 UTC (rev 17696)
+++ branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c	2008-12-03 17:36:30 UTC (rev 17697)
@@ -254,7 +254,8 @@
 	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++;