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.
189 lines
4.2 KiB
C++
189 lines
4.2 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 *****
|
|
*/
|
|
|
|
#ifndef __FREESTYLE_STROKE_ADVANCED_ITERATORS_H__
|
|
#define __FREESTYLE_STROKE_ADVANCED_ITERATORS_H__
|
|
|
|
/** \file blender/freestyle/intern/stroke/StrokeAdvancedIterators.h
|
|
* \ingroup freestyle
|
|
* \brief Iterators used to iterate over the elements of the Stroke. Can't be used in python
|
|
* \author Stephane Grabli
|
|
* \author Emmanuel Turquin
|
|
* \date 01/07/2003
|
|
*/
|
|
|
|
#include "Stroke.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
namespace StrokeInternal {
|
|
|
|
class vertex_const_traits : public Const_traits<StrokeVertex*>
|
|
{
|
|
public:
|
|
typedef std::deque<StrokeVertex*> vertex_container;
|
|
typedef vertex_container::const_iterator vertex_container_iterator;
|
|
};
|
|
|
|
class vertex_nonconst_traits : public Nonconst_traits<StrokeVertex*>
|
|
{
|
|
public:
|
|
typedef std::deque<StrokeVertex*> vertex_container; //! the vertices container
|
|
typedef vertex_container::iterator vertex_container_iterator;
|
|
};
|
|
|
|
|
|
template<class Traits>
|
|
class vertex_iterator_base : public IteratorBase<Traits, BidirectionalIteratorTag_Traits>
|
|
{
|
|
public:
|
|
typedef vertex_iterator_base<Traits> Self;
|
|
|
|
protected:
|
|
typedef IteratorBase<Traits, BidirectionalIteratorTag_Traits> parent_class;
|
|
typedef typename Traits::vertex_container_iterator vertex_container_iterator;
|
|
typedef vertex_iterator_base<vertex_nonconst_traits> iterator;
|
|
typedef vertex_iterator_base<vertex_const_traits> const_iterator;
|
|
|
|
//protected:
|
|
public:
|
|
vertex_container_iterator _it;
|
|
vertex_container_iterator _begin;
|
|
vertex_container_iterator _end;
|
|
|
|
public:
|
|
friend class Stroke;
|
|
//friend class vertex_iterator;
|
|
|
|
inline vertex_iterator_base() : parent_class() {}
|
|
|
|
inline vertex_iterator_base(const iterator& iBrother) : parent_class()
|
|
{
|
|
_it = iBrother._it;
|
|
_begin = iBrother._begin;
|
|
_end = iBrother._end;
|
|
}
|
|
|
|
inline vertex_iterator_base(const const_iterator& iBrother) : parent_class()
|
|
{
|
|
_it = iBrother._it;
|
|
_begin = iBrother._begin;
|
|
_end = iBrother._end;
|
|
}
|
|
|
|
//protected: //FIXME
|
|
public:
|
|
inline vertex_iterator_base(vertex_container_iterator it, vertex_container_iterator begin,
|
|
vertex_container_iterator end)
|
|
: parent_class()
|
|
{
|
|
_it = it;
|
|
_begin = begin;
|
|
_end = end;
|
|
}
|
|
|
|
public:
|
|
virtual ~vertex_iterator_base() {}
|
|
|
|
virtual bool begin() const
|
|
{
|
|
return (_it == _begin) ? true : false;
|
|
}
|
|
|
|
virtual bool end() const
|
|
{
|
|
return (_it == _end) ? true : false;
|
|
}
|
|
|
|
// operators
|
|
inline Self& operator++() // operator corresponding to ++i
|
|
{
|
|
++_it;
|
|
return *(this);
|
|
}
|
|
|
|
/* Operator corresponding to i++, i.e. which returns the value *and then* increments.
|
|
* That's why we store the value in a temp.
|
|
*/
|
|
inline Self operator++(int)
|
|
{
|
|
Self tmp = *this;
|
|
++_it;
|
|
return tmp;
|
|
}
|
|
|
|
inline Self& operator--() // operator corresponding to --i
|
|
{
|
|
--_it;
|
|
return *(this);
|
|
}
|
|
|
|
inline Self operator--(int)
|
|
{
|
|
Self tmp = *this;
|
|
--_it;
|
|
return tmp;
|
|
}
|
|
|
|
// comparibility
|
|
virtual bool operator!=(const Self& b) const
|
|
{
|
|
return (_it != b._it);
|
|
}
|
|
|
|
virtual bool operator==(const Self& b) const
|
|
{
|
|
return !(*this != b);
|
|
}
|
|
|
|
// dereferencing
|
|
virtual typename Traits::reference operator*() const
|
|
{
|
|
return *(_it);
|
|
}
|
|
|
|
virtual typename Traits::pointer operator->() const
|
|
{
|
|
return &(operator*());
|
|
}
|
|
|
|
/*! accessors */
|
|
inline vertex_container_iterator it() const
|
|
{
|
|
return _it;
|
|
}
|
|
|
|
inline vertex_container_iterator getBegin() const
|
|
{
|
|
return _begin;
|
|
}
|
|
|
|
inline vertex_container_iterator getEnd() const
|
|
{
|
|
return _end;
|
|
}
|
|
};
|
|
|
|
} // end of namespace StrokeInternal
|
|
|
|
} /* namespace Freestyle */
|
|
|
|
#endif // __FREESTYLE_STROKE_ADVANCED_ITERATORS_H__
|