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.
200 lines
4.5 KiB
C++
200 lines
4.5 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/ChainingIterators.cpp
|
|
* \ingroup freestyle
|
|
* \brief Chaining iterators
|
|
* \author Stephane Grabli
|
|
* \date 01/07/2003
|
|
*/
|
|
|
|
#include "ChainingIterators.h"
|
|
|
|
#include "../system/TimeStamp.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
ViewEdge *AdjacencyIterator::operator*()
|
|
{
|
|
return (*_internalIterator).first;
|
|
}
|
|
|
|
bool AdjacencyIterator::isIncoming() const
|
|
{
|
|
return (*_internalIterator).second;
|
|
}
|
|
|
|
int AdjacencyIterator::increment()
|
|
{
|
|
++_internalIterator;
|
|
while ((!_internalIterator.isEnd()) && (!isValid((*_internalIterator).first)))
|
|
++_internalIterator;
|
|
return 0;
|
|
}
|
|
|
|
bool AdjacencyIterator::isValid(ViewEdge *edge)
|
|
{
|
|
if (_restrictToSelection) {
|
|
if (edge->getTimeStamp() != TimeStamp::instance()->getTimeStamp())
|
|
return false;
|
|
}
|
|
if (_restrictToUnvisited) {
|
|
if (edge->getChainingTimeStamp() > TimeStamp::instance()->getTimeStamp())
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
int ChainingIterator::increment()
|
|
{
|
|
_increment = true;
|
|
ViewVertex *vertex = getVertex();
|
|
if (!vertex) {
|
|
_edge = 0;
|
|
return 0;
|
|
}
|
|
AdjacencyIterator it = AdjacencyIterator(vertex, _restrictToSelection, _restrictToUnvisited);
|
|
if (it.isEnd()) {
|
|
_edge = 0;
|
|
return 0;
|
|
}
|
|
if (traverse(it) < 0)
|
|
return -1;
|
|
_edge = result;
|
|
if (_edge == 0)
|
|
return 0;
|
|
if (_edge->A() == vertex)
|
|
_orientation = true;
|
|
else
|
|
_orientation = false;
|
|
return 0;
|
|
}
|
|
|
|
int ChainingIterator::decrement()
|
|
{
|
|
_increment = false;
|
|
ViewVertex *vertex = getVertex();
|
|
if (!vertex) {
|
|
_edge = 0;
|
|
return 0;
|
|
}
|
|
AdjacencyIterator it = AdjacencyIterator(vertex, _restrictToSelection, _restrictToUnvisited);
|
|
if (it.isEnd()) {
|
|
_edge = 0;
|
|
return 0;
|
|
}
|
|
if (traverse(it) < 0)
|
|
return -1;
|
|
_edge = result;
|
|
if (_edge == 0)
|
|
return 0;
|
|
if (_edge->B() == vertex)
|
|
_orientation = true;
|
|
else
|
|
_orientation = false;
|
|
return 0;
|
|
}
|
|
|
|
//
|
|
// ChainSilhouetteIterators
|
|
//
|
|
///////////////////////////////////////////////////////////
|
|
|
|
int ChainSilhouetteIterator::traverse(const AdjacencyIterator& ait)
|
|
{
|
|
AdjacencyIterator it(ait);
|
|
ViewVertex *nextVertex = getVertex();
|
|
// we can't get a NULL nextVertex here, it was intercepted before
|
|
if (nextVertex->getNature() & Nature::T_VERTEX) {
|
|
TVertex *tvertex = (TVertex *)nextVertex;
|
|
ViewEdge *mate = (tvertex)->mate(getCurrentEdge());
|
|
while (!it.isEnd()) {
|
|
ViewEdge *ve = *it;
|
|
if (ve == mate) {
|
|
result = ve;
|
|
return 0;
|
|
}
|
|
++it;
|
|
}
|
|
result = 0;
|
|
return 0;
|
|
}
|
|
if (nextVertex->getNature() & Nature::NON_T_VERTEX) {
|
|
//soc NonTVertex *nontvertex = (NonTVertex*)nextVertex;
|
|
ViewEdge *newEdge(0);
|
|
// we'll try to chain the edges by keeping the same nature...
|
|
// the preseance order is : SILHOUETTE, BORDER, CREASE, SUGGESTIVE, VALLEY, RIDGE
|
|
Nature::EdgeNature natures[6] = {
|
|
Nature::SILHOUETTE,
|
|
Nature::BORDER,
|
|
Nature::CREASE,
|
|
Nature::SUGGESTIVE_CONTOUR,
|
|
Nature::VALLEY,
|
|
Nature::RIDGE
|
|
};
|
|
for (unsigned int i = 0; i < 6; ++i) {
|
|
if (getCurrentEdge()->getNature() & natures[i]) {
|
|
int n = 0;
|
|
while (!it.isEnd()) {
|
|
ViewEdge *ve = *it;
|
|
if (ve->getNature() & natures[i]) {
|
|
++n;
|
|
newEdge = ve;
|
|
}
|
|
++it;
|
|
}
|
|
if (n == 1) {
|
|
result = newEdge;
|
|
}
|
|
else {
|
|
result = 0;
|
|
}
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
result = 0;
|
|
return 0;
|
|
}
|
|
|
|
int ChainPredicateIterator::traverse(const AdjacencyIterator& ait)
|
|
{
|
|
AdjacencyIterator it(ait);
|
|
// Iterates over next edges to see if one of them respects the predicate:
|
|
while (!it.isEnd()) {
|
|
ViewEdge *ve = *it;
|
|
if (_unary_predicate->operator()(*ve) < 0)
|
|
return -1;
|
|
if (_unary_predicate->result) {
|
|
if (_binary_predicate->operator()(*(getCurrentEdge()), *(ve)) < 0)
|
|
return -1;
|
|
if (_binary_predicate->result) {
|
|
result = ve;
|
|
return 0;
|
|
}
|
|
}
|
|
++it;
|
|
}
|
|
result = 0;
|
|
return 0;
|
|
}
|
|
|
|
} /* namespace Freestyle */
|