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.
194 lines
4.2 KiB
C++
194 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_PYTHON_INTERPRETER_H__
|
|
#define __FREESTYLE_PYTHON_INTERPRETER_H__
|
|
|
|
/** \file blender/freestyle/intern/system/PythonInterpreter.h
|
|
* \ingroup freestyle
|
|
* \brief Python Interpreter
|
|
* \author Emmanuel Turquin
|
|
* \date 17/04/2003
|
|
*/
|
|
|
|
#include <iostream>
|
|
#include <Python.h>
|
|
|
|
#include "StringUtils.h"
|
|
#include "Interpreter.h"
|
|
|
|
//soc
|
|
extern "C" {
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DNA_text_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_global.h"
|
|
#include "BKE_library.h"
|
|
#include "BKE_main.h"
|
|
#include "BKE_report.h"
|
|
#include "BKE_text.h"
|
|
|
|
#include "BPY_extern.h"
|
|
}
|
|
|
|
namespace Freestyle {
|
|
|
|
class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
|
|
{
|
|
public:
|
|
PythonInterpreter()
|
|
{
|
|
_language = "Python";
|
|
_context = 0;
|
|
//Py_Initialize();
|
|
}
|
|
|
|
virtual ~PythonInterpreter()
|
|
{
|
|
//Py_Finalize();
|
|
}
|
|
|
|
void setContext(bContext *C)
|
|
{
|
|
_context = C;
|
|
}
|
|
|
|
int interpretFile(const string& filename)
|
|
{
|
|
initPath();
|
|
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
BKE_reports_clear(reports);
|
|
char *fn = const_cast<char*>(filename.c_str());
|
|
#if 0
|
|
int status = BPY_filepath_exec(_context, fn, reports);
|
|
#else
|
|
int status;
|
|
Text *text = BKE_text_load(G.main, fn, G.main->name);
|
|
if (text) {
|
|
status = BPY_text_exec(_context, text, reports, false);
|
|
BKE_text_unlink(G.main, text);
|
|
BKE_libblock_free(&G.main->text, text);
|
|
}
|
|
else {
|
|
BKE_reportf(reports, RPT_ERROR, "Cannot open file: %s", fn);
|
|
status = 0;
|
|
}
|
|
#endif
|
|
|
|
if (status != 1) {
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretFile" << endl;
|
|
cerr << "File: " << fn << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
// cleaning up
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int interpretText(struct Text *text, const string& name) {
|
|
initPath();
|
|
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
if (!BPY_text_exec(_context, text, reports, false)) {
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretText" << endl;
|
|
cerr << "Name: " << name << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct Options
|
|
{
|
|
static void setPythonPath(const string& path)
|
|
{
|
|
_path = path;
|
|
}
|
|
|
|
static string getPythonPath()
|
|
{
|
|
return _path;
|
|
}
|
|
};
|
|
|
|
void reset()
|
|
{
|
|
Py_Finalize();
|
|
Py_Initialize();
|
|
_initialized = false;
|
|
}
|
|
|
|
private:
|
|
bContext *_context;
|
|
|
|
void initPath()
|
|
{
|
|
if (_initialized)
|
|
return;
|
|
|
|
vector<string> pathnames;
|
|
StringUtils::getPathName(_path, "", pathnames);
|
|
|
|
struct Text *text = BKE_text_add(G.main, "tmp_freestyle_initpath.txt");
|
|
string cmd = "import sys\n";
|
|
txt_insert_buf(text, const_cast<char*>(cmd.c_str()));
|
|
|
|
for (vector<string>::const_iterator it = pathnames.begin(); it != pathnames.end(); ++it) {
|
|
if (!it->empty()) {
|
|
if (G.debug & G_DEBUG_FREESTYLE) {
|
|
cout << "Adding Python path: " << *it << endl;
|
|
}
|
|
cmd = "sys.path.append(r\"" + *it + "\")\n";
|
|
txt_insert_buf(text, const_cast<char *>(cmd.c_str()));
|
|
}
|
|
}
|
|
|
|
BPY_text_exec(_context, text, NULL, false);
|
|
|
|
// cleaning up
|
|
BKE_text_unlink(G.main, text);
|
|
BKE_libblock_free(&G.main->text, text);
|
|
|
|
//PyRun_SimpleString("from Freestyle import *");
|
|
_initialized = true;
|
|
}
|
|
|
|
static bool _initialized;
|
|
static string _path;
|
|
};
|
|
|
|
} /* namespace Freestyle */
|
|
|
|
#endif // __FREESTYLE_PYTHON_INTERPRETER_H__
|