Tamito Kajiyama
800f86c845
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.
102 lines
2.4 KiB
C++
102 lines
2.4 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.
|
|
*
|
|
* The Original Code is:
|
|
* OGF/Graphite: Geometry and Graphics Programming Library + Utilities
|
|
* Copyright (C) 2000 Bruno Levy
|
|
* Contact: Bruno Levy
|
|
* levy@loria.fr
|
|
* ISA Project
|
|
* LORIA, INRIA Lorraine,
|
|
* Campus Scientifique, BP 239
|
|
* 54506 VANDOEUVRE LES NANCY CEDEX
|
|
* FRANCE
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file blender/freestyle/intern/geometry/normal_cycle.cpp
|
|
* \ingroup freestyle
|
|
* \author Bruno Levy
|
|
*/
|
|
|
|
#include "matrix_util.h"
|
|
#include "normal_cycle.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
namespace OGF {
|
|
|
|
//_________________________________________________________
|
|
|
|
|
|
NormalCycle::NormalCycle()
|
|
{
|
|
}
|
|
|
|
void NormalCycle::begin()
|
|
{
|
|
M_[0] = M_[1] = M_[2] = M_[3] = M_[4] = M_[5] = 0;
|
|
}
|
|
|
|
void NormalCycle::end()
|
|
{
|
|
double eigen_vectors[9];
|
|
MatrixUtil::semi_definite_symmetric_eigen(M_, 3, eigen_vectors, eigen_value_);
|
|
|
|
axis_[0] = Vec3r(eigen_vectors[0], eigen_vectors[1], eigen_vectors[2]);
|
|
|
|
axis_[1] = Vec3r(eigen_vectors[3], eigen_vectors[4], eigen_vectors[5]);
|
|
|
|
axis_[2] = Vec3r(eigen_vectors[6], eigen_vectors[7], eigen_vectors[8]);
|
|
|
|
// Normalize the eigen vectors
|
|
for (int i = 0; i < 3; i++) {
|
|
axis_[i].normalize();
|
|
}
|
|
|
|
// Sort the eigen vectors
|
|
i_[0] = 0;
|
|
i_[1] = 1;
|
|
i_[2] = 2;
|
|
|
|
double l0 = ::fabs(eigen_value_[0]);
|
|
double l1 = ::fabs(eigen_value_[1]);
|
|
double l2 = ::fabs(eigen_value_[2]);
|
|
|
|
if (l1 > l0) {
|
|
ogf_swap(l0, l1 );
|
|
ogf_swap(i_[0], i_[1]);
|
|
}
|
|
if (l2 > l1) {
|
|
ogf_swap(l1, l2 );
|
|
ogf_swap(i_[1], i_[2]);
|
|
}
|
|
if (l1 > l0) {
|
|
ogf_swap(l0, l1 );
|
|
ogf_swap(i_[0], i_[1]);
|
|
}
|
|
}
|
|
|
|
//_________________________________________________________
|
|
|
|
} // OGF namespace
|
|
|
|
} /* namespace Freestyle */
|