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>2017-11-29 13:30:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-11-29 13:32:16 +0300
commit28048f75ce42b370c76cc62a6b8b5de14586fcd6 (patch)
tree0a7d2aa0735e3b2c2c65a205e4663db16547eafc /source/blender/freestyle
parent69d33ecdec0d131ede1ed488fc1cf16689c07284 (diff)
parente32cfb0743d9b4da08403f9fd33abd1cadbd0299 (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 0e08af1bac8..79ba9421cda 100644
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -52,7 +52,7 @@ extern "C" {
#include "BPY_extern.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
}
namespace Freestyle {