A crash in the Freestyle renderer was reported by Ton on IRC with a stack trace below. Note that #2 is in Freestyle, whereas #1 is in the compositor. The problem was observed in a debug build on OS X 10.7 (gcc 4.2, openmp disabled, no llvm). ---------------------------------------------------------------------- Program received signal EXC_BAD_ACCESS, Could not access memory. Reason: 13 at address: 0x0000000000000000 [Switching to process 72386 thread 0xf303] 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 43 delete (this->m_outputsockets.back()); Current language: auto; currently c++ (gdb) where #0 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 #1 0x0000000100c29066 in Node::~Node (this=0x10e501c80) at COM_Node.h:49 #2 0x000000010089c273 in NodeShape::~NodeShape (this=0x10e501c80) at NodeShape.cpp:43 #3 0x000000010089910b in NodeGroup::destroy (this=0x10e501da0) at NodeGroup.cpp:61 #4 0x00000001008990cd in NodeGroup::destroy (this=0x10e5014b0) at NodeGroup.cpp:59 #5 0x00000001008990cd in NodeGroup::destroy (this=0x114e18da0) at NodeGroup.cpp:59 #6 0x00000001007e6602 in Controller::ClearRootNode (this=0x114e19640) at Controller.cpp:329 #7 0x00000001007ea52e in Controller::LoadMesh (this=0x114e19640, re=0x10aba4638, srl=0x1140f5258) at Controller.cpp:302 #8 0x00000001008030ad in prepare (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:302 #9 0x000000010080457a in FRS_do_stroke_rendering (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:600 #10 0x00000001006aeb9d in add_freestyle (re=0x10aba4638) at pipeline.c:1584 #11 0x00000001006aceb7 in do_render_3d (re=0x10aba4638) at pipeline.c:1094 #12 0x00000001006ae061 in do_render_fields_blur_3d (re=0x10aba4638) at pipeline.c:1367 #13 0x00000001006afa16 in do_render_composite_fields_blur_3d (re=0x10aba4638) at pipeline.c:1815 #14 0x00000001006b04e4 in do_render_all_options (re=0x10aba4638) at pipeline.c:2021 ---------------------------------------------------------------------- Apparently a name conflict between the two Blender modules is taking place. The present commit hence intends to address it by putting all the Freestyle C++ classes in the namespace 'Freestyle'. This revision will also prevent potential name conflicts with other Blender modules in the future. Special thanks to Lukas Toenne for the help with C++ namespace.
154 lines
3.9 KiB
C++
154 lines
3.9 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file blender/freestyle/intern/stroke/Chain.cpp
|
|
* \ingroup freestyle
|
|
* \brief Class to define a chain of viewedges.
|
|
* \author Stephane Grabli
|
|
* \date 09/01/2003
|
|
*/
|
|
|
|
#include "Chain.h"
|
|
|
|
#include "../view_map/ViewMapAdvancedIterators.h"
|
|
#include "../view_map/ViewMapIterators.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
void Chain::push_viewedge_back(ViewEdge *iViewEdge, bool orientation)
|
|
{
|
|
ViewEdge::vertex_iterator v;
|
|
ViewEdge::vertex_iterator vend;
|
|
ViewEdge::vertex_iterator vfirst;
|
|
Vec3r previous, current;
|
|
if (true == orientation) {
|
|
v = iViewEdge->vertices_begin();
|
|
vfirst = v;
|
|
vend = iViewEdge->vertices_end();
|
|
}
|
|
else {
|
|
v = iViewEdge->vertices_last();
|
|
vfirst = v;
|
|
vend = iViewEdge->vertices_end();
|
|
}
|
|
|
|
if (!_Vertices.empty()) {
|
|
previous = _Vertices.back()->point2d();
|
|
if (orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
// Ensure the continuity of underlying FEdges
|
|
CurvePoint *cp = _Vertices.back(); // assumed to be instantiated as new CurvePoint(iSVertex, 0, 0.f);
|
|
SVertex *sv_first = (*vfirst);
|
|
FEdge *fe = _fedgeB->duplicate();
|
|
fe->setVertexB(sv_first);
|
|
fe->vertexA()->shape()->AddEdge(fe);
|
|
fe->vertexA()->AddFEdge(fe);
|
|
fe->vertexB()->AddFEdge(fe);
|
|
cp->setA(sv_first);
|
|
}
|
|
else {
|
|
previous = (*v)->point2d();
|
|
}
|
|
do {
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_back(*v);
|
|
//_Length += (current - previous).norm();
|
|
previous = current;
|
|
if (orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
} while ((v != vend) && (v != vfirst));
|
|
|
|
if (v == vfirst) {
|
|
//Add last one:
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_back(*v);
|
|
//_Length += (current - previous).norm();
|
|
}
|
|
|
|
_fedgeB = (orientation) ? iViewEdge->fedgeB() : iViewEdge->fedgeA();
|
|
}
|
|
|
|
void Chain::push_viewedge_front(ViewEdge *iViewEdge, bool orientation)
|
|
{
|
|
orientation = !orientation;
|
|
ViewEdge::vertex_iterator v;
|
|
ViewEdge::vertex_iterator vend;
|
|
ViewEdge::vertex_iterator vfirst;
|
|
Vec3r previous, current;
|
|
if (true == orientation) {
|
|
v = iViewEdge->vertices_begin();
|
|
vfirst = v;
|
|
vend = iViewEdge->vertices_end();
|
|
}
|
|
else {
|
|
v = iViewEdge->vertices_last();
|
|
vfirst = v;
|
|
vend = iViewEdge->vertices_end();
|
|
}
|
|
|
|
if (!_Vertices.empty()) {
|
|
previous = _Vertices.front()->point2d();
|
|
if (orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
// Ensure the continuity of underlying FEdges
|
|
CurvePoint *cp = _Vertices.front(); // assumed to be instantiated as new CurvePoint(iSVertex, 0, 0.f);
|
|
SVertex *sv_last = cp->A();
|
|
SVertex *sv_curr = (*v);
|
|
FEdge *fe = (orientation) ? iViewEdge->fedgeA() : iViewEdge->fedgeB();
|
|
FEdge *fe2 = fe->duplicate();
|
|
fe2->setVertexA(sv_curr);
|
|
fe2->setVertexB(sv_last);
|
|
sv_last->AddFEdge(fe2);
|
|
sv_curr->AddFEdge(fe2);
|
|
sv_curr->shape()->AddEdge(fe2);
|
|
}
|
|
else {
|
|
previous = (*v)->point2d();
|
|
}
|
|
do {
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_front((*v));
|
|
//_Length += (current - previous).norm();
|
|
previous = current;
|
|
if (orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
} while ((v != vend) && (v != vfirst));
|
|
|
|
if (v == vfirst) {
|
|
//Add last one:
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_front(*v);
|
|
//_Length += (current - previous).norm();
|
|
}
|
|
|
|
if (!_fedgeB)
|
|
_fedgeB = (orientation) ? iViewEdge->fedgeB() : iViewEdge->fedgeA();
|
|
}
|
|
|
|
} /* namespace Freestyle */
|