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.
128 lines
3.7 KiB
C++
128 lines
3.7 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 __BLENDER_FILE_LOADER_H__
|
|
#define __BLENDER_FILE_LOADER_H__
|
|
|
|
/** \file blender/freestyle/intern/blender_interface/BlenderFileLoader.h
|
|
* \ingroup freestyle
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <float.h>
|
|
|
|
#include "../geometry/BBox.h"
|
|
#include "../geometry/Geom.h"
|
|
#include "../geometry/GeomCleaner.h"
|
|
#include "../geometry/GeomUtils.h"
|
|
#include "../scene_graph/IndexedFaceSet.h"
|
|
#include "../scene_graph/NodeGroup.h"
|
|
#include "../scene_graph/NodeTransform.h"
|
|
#include "../scene_graph/NodeShape.h"
|
|
#include "../system/FreestyleConfig.h"
|
|
#include "../system/RenderMonitor.h"
|
|
|
|
extern "C" {
|
|
#include "DNA_material_types.h"
|
|
#include "DNA_meshdata_types.h"
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "renderdatabase.h"
|
|
#include "render_types.h"
|
|
|
|
#include "BKE_mesh.h"
|
|
#include "BKE_scene.h"
|
|
|
|
#include "BLI_math.h"
|
|
}
|
|
|
|
namespace Freestyle {
|
|
|
|
class NodeGroup;
|
|
|
|
struct LoaderState {
|
|
float *pv;
|
|
float *pn;
|
|
IndexedFaceSet::FaceEdgeMark *pm;
|
|
unsigned *pvi;
|
|
unsigned *pni;
|
|
unsigned *pmi;
|
|
unsigned currentIndex;
|
|
unsigned currentMIndex;
|
|
float minBBox[3];
|
|
float maxBBox[3];
|
|
};
|
|
|
|
class LIB_SCENE_GRAPH_EXPORT BlenderFileLoader
|
|
{
|
|
public:
|
|
/*! Builds a MaxFileLoader */
|
|
BlenderFileLoader(Render *re, SceneRenderLayer *srl);
|
|
virtual ~BlenderFileLoader();
|
|
|
|
/*! Loads the 3D scene and returns a pointer to the scene root node */
|
|
NodeGroup * Load();
|
|
|
|
/*! Gets the number of read faces */
|
|
inline unsigned int numFacesRead() {return _numFacesRead;}
|
|
|
|
/*! Gets the smallest edge size read */
|
|
inline real minEdgeSize() {return _minEdgeSize;}
|
|
|
|
/*! Modifiers */
|
|
inline void setRenderMonitor(RenderMonitor *iRenderMonitor) {_pRenderMonitor = iRenderMonitor;}
|
|
|
|
protected:
|
|
void insertShapeNode(ObjectInstanceRen *obi, int id);
|
|
int testDegenerateTriangle(float v1[3], float v2[3], float v3[3]);
|
|
bool testEdgeRotation(float v1[3], float v2[3], float v3[3], float v4[3]);
|
|
int countClippedFaces(float v1[3], float v2[3], float v3[3], int clip[3]);
|
|
void clipLine(float v1[3], float v2[3], float c[3], float z);
|
|
void clipTriangle(int numTris, float triCoords[][3], float v1[3], float v2[3], float v3[3],
|
|
float triNormals[][3], float n1[3], float n2[3], float n3[3],
|
|
bool edgeMarks[5], bool em1, bool em2, bool em3, int clip[3]);
|
|
void addTriangle(struct LoaderState *ls, float v1[3], float v2[3], float v3[3],
|
|
float n1[3], float n2[3], float n3[3], bool fm, bool em1, bool em2, bool em3);
|
|
|
|
protected:
|
|
struct detri_t {
|
|
unsigned viA, viB, viP; // 0 <= viA, viB, viP < viSize
|
|
Vec3r v;
|
|
unsigned n;
|
|
};
|
|
Render *_re;
|
|
SceneRenderLayer *_srl;
|
|
NodeGroup *_Scene;
|
|
unsigned _numFacesRead;
|
|
real _minEdgeSize;
|
|
bool _smooth; /* if true, face smoothness is taken into account */
|
|
float _viewplane_left;
|
|
float _viewplane_right;
|
|
float _viewplane_bottom;
|
|
float _viewplane_top;
|
|
float _z_near, _z_far;
|
|
|
|
RenderMonitor *_pRenderMonitor;
|
|
};
|
|
|
|
} /* namespace Freestyle */
|
|
|
|
#endif // __BLENDER_FILE_LOADER_H__
|