[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31248] branches/nurbs-merge/intern/ nurbana/intern: Typo memory leak, fixed up some other stuff too

[Sergey Sharybin]

Revision: 31248
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31248
Author:   nazgul
Date:     2010-08-11 17:40:07 +0200 (Wed, 11 Aug 2010)

Log Message:
-----------
Typo memory leak, fixed up some other stuff too

Merge rev28445 from nurbs25 branch

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28445

Modified Paths:
--------------
    branches/nurbs-merge/intern/nurbana/intern/nbNURBS.cpp
    branches/nurbs-merge/intern/nurbana/intern/nbTessellator.h

Modified: branches/nurbs-merge/intern/nurbana/intern/nbNURBS.cpp
===================================================================
--- branches/nurbs-merge/intern/nurbana/intern/nbNURBS.cpp	2010-08-11 15:39:58 UTC (rev 31247)
+++ branches/nurbs-merge/intern/nurbana/intern/nbNURBS.cpp	2010-08-11 15:40:07 UTC (rev 31248)
@@ -112,14 +112,21 @@
 }
 
 nbNURBS::~nbNURBS() {
-	/*  if(m_sum)
-	MEM_freeN(m_sum);
+	 if(m_sum)
+		MEM_freeN(m_sum);
+	m_sum = NULL;
 	if(m_sumIPC[0])
-	MEM_freeN(m_sumIPC[0]);
+		MEM_freeN(m_sumIPC[0]);
+	m_sumIPC[0] = NULL;
 	if(m_sumIPC[1])
-	MEM_freeN(m_sumIPC[1]);
+		MEM_freeN(m_sumIPC[1]);
+	m_sumIPC[1] = NULL;
 	if(m_oldBuffer)
-	MEM_freeN(m_oldBuffer);*/
+		MEM_freeN(m_oldBuffer);
+	m_oldBuffer = NULL;
+	if(m_ctlPtsOld)
+		MEM_freeN(m_ctlPtsOld);
+	m_ctlPtsOld = NULL;
 	//  if(_Normals)
 	//	  MEM_freeN(_Normals);
 } //eof nbNURBS::~nbNURBS()
@@ -183,7 +190,7 @@
 	m_sum = (nbReal*)MEM_callocN(sizeof(nbReal)*len*4,"m_sum realloc");
 
 	//len = tessU * tessV;
-	m_sum = (nbReal*)MEM_callocN(sizeof(nbReal)*tessU * tessV,"m_sum realloc");
+	//m_sum = (nbReal*)MEM_callocN(sizeof(nbReal)*tessU * tessV,"m_sum realloc");
 
 	//_Change[0] = 1;
 }

Modified: branches/nurbs-merge/intern/nurbana/intern/nbTessellator.h
===================================================================
--- branches/nurbs-merge/intern/nurbana/intern/nbTessellator.h	2010-08-11 15:39:58 UTC (rev 31247)
+++ branches/nurbs-merge/intern/nurbana/intern/nbTessellator.h	2010-08-11 15:40:07 UTC (rev 31248)
@@ -24,11 +24,11 @@
 	virtual void getNormals(const int* qIndexes, const int* tIndexes, const nbReal* verts, nbReal* nors);
 	virtual void update() {};
 
-#ifdef WITH_CXX_GUARDEDALLOC
-	public:
-		void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
-		void operator delete( void *mem ) { MEM_freeN(mem); }
-#endif
+//#ifdef WITH_CXX_GUARDEDALLOC
+//	public:
+//		void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
+//		void operator delete( void *mem ) { MEM_freeN(mem); }
+//#endif
 
 };