diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2015-04-28 17:18:32 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2015-04-28 18:57:56 +0300 |
| commit | 85ae4b87afa80527a36d3bd3164a9df6544f0c3b (patch) | |
| tree | dc6dbd0992f9bbf97e4fe39f1df038b005e79d00 /source/blender/freestyle/intern/application/Controller.h | |
| parent | 7851534541b02a05b8b647be01c726373185f758 (diff) | |
Fix T44404: freestyle crashes blender.
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.
Diffstat (limited to 'source/blender/freestyle/intern/application/Controller.h')
| -rw-r--r-- | source/blender/freestyle/intern/application/Controller.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index 9fe57d92cf4..a09964a4e79 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -90,6 +90,7 @@ public: Render *RenderStrokes(Render *re, bool render); void SwapStyleModules(unsigned i1, unsigned i2); void InsertStyleModule(unsigned index, const char *iFileName); + void InsertStyleModule(unsigned index, const char *iName, const char *iBuffer); void InsertStyleModule(unsigned index, const char *iName, struct Text *iText); void AddStyleModule(const char *iFileName); void RemoveStyleModule(unsigned index); |