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:
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h2
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp2
-rw-r--r--source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp4
-rw-r--r--source/blender/freestyle/intern/system/PythonInterpreter.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
index dc6677bdcf4..8b125828fdc 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
@@ -35,9 +35,9 @@
#include "../system/FreestyleConfig.h"
#include "../system/RenderMonitor.h"
-extern "C" {
#include "MEM_guardedalloc.h"
+extern "C" {
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 06087cd7fa6..56ff733483f 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -23,9 +23,9 @@
#include "../application/AppConfig.h"
#include "../stroke/Canvas.h"
-extern "C" {
#include "MEM_guardedalloc.h"
+extern "C" {
#include "RNA_access.h"
#include "RNA_types.h"
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 07839ac6e61..0567bd0df06 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -32,10 +32,10 @@
using namespace std;
using namespace Freestyle;
-extern "C" {
-
#include "MEM_guardedalloc.h"
+extern "C" {
+
#include "DNA_camera_types.h"
#include "DNA_collection_types.h"
#include "DNA_freestyle_types.h"
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index 1fed6a00463..255a1b2a152 100644
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -31,10 +31,10 @@ extern "C" {
#include "StringUtils.h"
#include "Interpreter.h"
-// soc
-extern "C" {
#include "MEM_guardedalloc.h"
+// soc
+extern "C" {
#include "DNA_text_types.h"
#include "BKE_context.h"