[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33322] trunk/blender/intern/boolop/intern : Fix #24775: boolean modifier crash in rendering on Mac.

Brecht Van Lommel brechtvanlommel at pandora.be
Fri Nov 26 04:26:59 CET 2010


Revision: 33322
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33322
Author:   blendix
Date:     2010-11-26 04:26:57 +0100 (Fri, 26 Nov 2010)

Log Message:
-----------
Fix #24775: boolean modifier crash in rendering on Mac. Problem was that this
ran out of stack memory, now it passes some arguments by reference instead of
by value to use less stack space.

Modified Paths:
--------------
    trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp
    trunk/blender/intern/boolop/intern/BOP_BSPNode.h

Modified: trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp	2010-11-26 00:52:37 UTC (rev 33321)
+++ trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp	2010-11-26 03:26:57 UTC (rev 33322)
@@ -59,7 +59,7 @@
  * @param plane face plane.
  */
 
-unsigned int BOP_BSPNode::addFace(BOP_BSPPoints pts,
+unsigned int BOP_BSPNode::addFace(const BOP_BSPPoints& pts,
 								  const MT_Plane3& plane )
 {
 	unsigned int newDeep = 0;

Modified: trunk/blender/intern/boolop/intern/BOP_BSPNode.h
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_BSPNode.h	2010-11-26 00:52:37 UTC (rev 33321)
+++ trunk/blender/intern/boolop/intern/BOP_BSPNode.h	2010-11-26 03:26:57 UTC (rev 33322)
@@ -33,7 +33,7 @@
 #include "BOP_Face.h"
 
 typedef vector<MT_Point3> BOP_BSPPoints;
-typedef vector<MT_Point3>::iterator BOP_IT_BSPPoints;
+typedef vector<MT_Point3>::const_iterator BOP_IT_BSPPoints;
 
 class BOP_BSPNode
 {
@@ -47,7 +47,7 @@
 	// Construction methods
 	BOP_BSPNode(const MT_Plane3& plane);
 	~BOP_BSPNode();
-	unsigned int addFace(BOP_BSPPoints pts, 
+	unsigned int addFace(const BOP_BSPPoints& pts, 
 						 const MT_Plane3& plane);
 	BOP_TAG classifyFace(const MT_Point3& p1, 
 						 const MT_Point3& p2, 





More information about the Bf-blender-cvs mailing list