diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-26 18:38:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-27 14:22:01 +0300 |
| commit | 1107af1abb0d4bf271e995a18f5d4bd790d51d02 (patch) | |
| tree | a5cc6e1390176cdb62bf40870d4dd5a5b18ee617 /source/blender/freestyle | |
| parent | 9cacadc8a637cc6c96380f73c4bfd1d6967351bd (diff) | |
Fix OBJECT_GUARDED_FREE compiler error when type is in namespace
Diffstat (limited to 'source/blender/freestyle')
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" |