Tamito Kajiyama
85ae4b87af
The reported crash case seems to be caused by freeing compiled Python objects in a thread. Now this issue is avoided by allocating a buffer to store a Python script and using BPY_string_exec() to run the script. This makes it unnecessary to repeatedly create and destroy Text data blocks. Many thanks to Campbell Barton for his help on the bug fix.
98 lines
2.3 KiB
C++
98 lines
2.3 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 __BLENDERSTYLEMODULE_H__
|
|
#define __BLENDERSTYLEMODULE_H__
|
|
|
|
/** \file blender/freestyle/intern/blender_interface/BlenderStyleModule.h
|
|
* \ingroup freestyle
|
|
*/
|
|
|
|
#include "../stroke/StyleModule.h"
|
|
#include "../system/PythonInterpreter.h"
|
|
|
|
extern "C" {
|
|
#include "BLI_utildefines.h" // BLI_assert()
|
|
|
|
struct Text;
|
|
}
|
|
|
|
namespace Freestyle {
|
|
|
|
class BufferedStyleModule : public StyleModule
|
|
{
|
|
public:
|
|
BufferedStyleModule(const string& buffer, const string& file_name, Interpreter *inter) : StyleModule(file_name, inter)
|
|
{
|
|
_buffer = buffer;
|
|
}
|
|
|
|
virtual ~BufferedStyleModule()
|
|
{
|
|
}
|
|
|
|
protected:
|
|
virtual int interpret()
|
|
{
|
|
PythonInterpreter *py_inter = dynamic_cast<PythonInterpreter*>(_inter);
|
|
BLI_assert(py_inter != 0);
|
|
return py_inter->interpretString(_buffer, getFileName());
|
|
}
|
|
|
|
private:
|
|
string _buffer;
|
|
|
|
#ifdef WITH_CXX_GUARDEDALLOC
|
|
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BufferedStyleModule")
|
|
#endif
|
|
};
|
|
|
|
class BlenderStyleModule : public StyleModule
|
|
{
|
|
public:
|
|
BlenderStyleModule(struct Text *text, const string &name, Interpreter *inter) : StyleModule(name, inter)
|
|
{
|
|
_text = text;
|
|
}
|
|
|
|
virtual ~BlenderStyleModule()
|
|
{
|
|
}
|
|
|
|
protected:
|
|
virtual int interpret()
|
|
{
|
|
PythonInterpreter *py_inter = dynamic_cast<PythonInterpreter*>(_inter);
|
|
BLI_assert(py_inter != 0);
|
|
return py_inter->interpretText(_text, getFileName());
|
|
}
|
|
|
|
private:
|
|
struct Text *_text;
|
|
|
|
#ifdef WITH_CXX_GUARDEDALLOC
|
|
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderStyleModule")
|
|
#endif
|
|
};
|
|
|
|
} /* namespace Freestyle */
|
|
|
|
#endif // __BLENDERSTYLEMODULE_H__
|