diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-06-26 17:07:39 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-06-26 17:07:39 +0300 |
| commit | fbaf6e6fb3d2eb2f0c737b7d4713a5ea171738e6 (patch) | |
| tree | 35bfa54eef6240693a13d594bb49ed7c8d33b32e /source/blender/freestyle/intern/system/PythonInterpreter.h | |
| parent | bba0ad903cfa407368c78b0b8480b1a729474305 (diff) | |
| parent | c07f2bc89196ea449a2875634eb85efa45733fb5 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into temp-dynamic-overridestemp-dynamic-overrides
Diffstat (limited to 'source/blender/freestyle/intern/system/PythonInterpreter.h')
| -rw-r--r-- | source/blender/freestyle/intern/system/PythonInterpreter.h | 2 |
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 79ba9421cda..4f5e94ef7a0 100644 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -81,7 +81,7 @@ public: bool ok = BPY_execute_filepath(_context, fn, reports); #else bool ok; - Text *text = BKE_text_load(&_freestyle_bmain, fn, G.main->name); + Text *text = BKE_text_load(&_freestyle_bmain, fn, G_MAIN->name); if (text) { ok = BPY_execute_text(_context, text, reports, false); BKE_libblock_delete(&_freestyle_bmain, text); |