Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-10 02:57:35 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-10 02:57:35 +0300
commit0121258770584b495964f5ba241bdead2018eb22 (patch)
treef8d70746768ccbabd1328d40e462de068e162398 /source/blender/freestyle
parent2f44ea68d3dcbf60887617255136e659d7edff37 (diff)
parent7efac2b0b09d9e76d9fc573ec7936a1c6440c067 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/system/PythonInterpreter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index 4f5e94ef7a0..cb49e7718a0 100644
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -112,7 +112,7 @@ public:
BKE_reports_clear(reports);
- if (!BPY_execute_string(_context, str.c_str())) {
+ if (!BPY_execute_string(_context, NULL, str.c_str())) {
BPy_errors_to_report(reports);
cerr << "\nError executing Python script from PythonInterpreter::interpretString" << endl;
cerr << "Name: " << name << endl;