sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

A couple of small fixes to clear up some warnings.

Browse Source 
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
This commit is contained in:
Kent Mein 2008-12-03 17:36:30 +00:00
parent 4e6b6dd3f9
commit edc06b0b5b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/boolop/intern/BOP_Merge2.cpp
View File

@ -294,8 +294,8 @@ void BOP_Merge2::cleanup( void )
BOP_Vertexs v = m_mesh->getVertexs(); BOP_Vertexs v = m_mesh->getVertexs();
for( BOP_IT_Vertexs it = v.begin(); it != v.end(); ++it ) { for( BOP_IT_Vertexs it = v.begin(); it != v.end(); ++it ) {
if( (*it)->getTAG() != BROKEN) { if( (*it)->getTAG() != BROKEN) {
BOP_Indexs edges = (*it)->getEdges(); BOP_Indexs iedges = (*it)->getEdges();
for(BOP_IT_Indexs i = edges.begin();i!=edges.end();i++) for(BOP_IT_Indexs i = iedges.begin();i!=iedges.end();i++)
if( m_mesh->getEdge((*i))->getUsed( ) == false) (*it)->removeEdge( *i ); if( m_mesh->getEdge((*i))->getUsed( ) == false) (*it)->removeEdge( *i );
if( (*it)->getEdges().size() == 0 ) (*it)->setTAG(BROKEN); if( (*it)->getEdges().size() == 0 ) (*it)->setTAG(BROKEN);
} }
@ -432,8 +432,8 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices)
vert->setTAG(BROKEN); vert->setTAG(BROKEN);
for(BOP_IT_Indexs it = edges.begin(); it != edges.end(); for(BOP_IT_Indexs it = edges.begin(); it != edges.end();
++it ) { ++it ) {
BOP_Edge *edge = m_mesh->getEdge(*it); BOP_Edge *tedge = m_mesh->getEdge(*it);
edge->setUsed(false); tedge->setUsed(false);
} }
didMerge = true; didMerge = true;
} }

1
source/blender/editors/interface/resources.c
View File

@ -53,6 +53,7 @@
#include "BIF_gl.h" #include "BIF_gl.h"
#include "UI_resources.h" #include "UI_resources.h"
#include "UI_interface_icons.h"
//#include "UI_icons.h" //#include "UI_icons.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"

3
source/blender/editors/space_time/ed_markers.c
View File

@ -254,7 +254,8 @@ static int ed_marker_move_init(bContext *C, wmOperator *op)
ListBase *markers= context_get_markers(C); ListBase *markers= context_get_markers(C);
MarkerMove *mm; MarkerMove *mm;
TimeMarker *marker; TimeMarker *marker;
int totmark, a; int totmark=0;
int a;
for (marker= markers->first; marker; marker= marker->next) for (marker= markers->first; marker; marker= marker->next)
if (marker->flag & SELECT) totmark++; if (marker->flag & SELECT) totmark++;