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.
99 lines
2.5 KiB
C++
99 lines
2.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 *****
|
|
*/
|
|
|
|
#ifndef __APPCANVAS_H__
|
|
#define __APPCANVAS_H__
|
|
|
|
/** \file blender/freestyle/intern/application/AppCanvas.h
|
|
* \ingroup freestyle
|
|
*/
|
|
|
|
#include "../stroke/Canvas.h"
|
|
#include "AppView.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
class AppCanvas : public Canvas
|
|
{
|
|
public:
|
|
AppCanvas();
|
|
AppCanvas(AppView *iViewer);
|
|
AppCanvas(const AppCanvas& iBrother);
|
|
virtual ~AppCanvas();
|
|
|
|
/*! operations that need to be done before a draw */
|
|
virtual void preDraw();
|
|
|
|
/*! operations that need to be done after a draw */
|
|
virtual void postDraw();
|
|
|
|
/*! Erases the layers and clears the canvas */
|
|
virtual void Erase();
|
|
|
|
/* init the canvas */
|
|
virtual void init();
|
|
|
|
/*! Reads a pixel area from the canvas */
|
|
virtual void readColorPixels(int x, int y, int w, int h, RGBImage& oImage) const;
|
|
/*! Reads a depth pixel area from the canvas */
|
|
virtual void readDepthPixels(int x, int y, int w, int h, GrayImage& oImage) const;
|
|
|
|
virtual BBox<Vec3r> scene3DBBox() const;
|
|
|
|
/* abstract */
|
|
virtual void RenderStroke(Stroke *);
|
|
virtual void update();
|
|
|
|
|
|
/*! accessors */
|
|
virtual int width() const;
|
|
virtual int height() const;
|
|
virtual BBox<Vec2i> border() const;
|
|
virtual float thickness() const;
|
|
|
|
AppView *_pViewer;
|
|
inline const AppView * viewer() const {return _pViewer;}
|
|
|
|
/*! modifiers */
|
|
void setViewer(AppView *iViewer);
|
|
|
|
/* soc */
|
|
void setPassDiffuse(float *buf, int width, int height) {
|
|
_pass_diffuse.buf = buf;
|
|
_pass_diffuse.width = width;
|
|
_pass_diffuse.height = height;
|
|
}
|
|
void setPassZ(float *buf, int width, int height) {
|
|
_pass_z.buf = buf;
|
|
_pass_z.width = width;
|
|
_pass_z.height = height;
|
|
}
|
|
|
|
private:
|
|
struct {
|
|
float *buf;
|
|
int width, height;
|
|
} _pass_diffuse, _pass_z;
|
|
};
|
|
|
|
} /* namespace Freestyle */
|
|
|
|
#endif // __APPCANVAS_H__
|