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/compositor | |
parent | 9cacadc8a637cc6c96380f73c4bfd1d6967351bd (diff) |
Fix OBJECT_GUARDED_FREE compiler error when type is in namespace
Diffstat (limited to 'source/blender/compositor')
8 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 5bd466658c0..ff9fc7dbcbc 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -17,6 +17,7 @@ */ #include "COM_CompositorOperation.h" +#include "MEM_guardedalloc.h" #include "BLI_listbase.h" #include "BKE_global.h" #include "BKE_image.h" @@ -26,7 +27,6 @@ extern "C" { #include "RE_pipeline.h" #include "RE_shader_ext.h" #include "RE_render_ext.h" -#include "MEM_guardedalloc.h" #include "render_types.h" } #include "PIL_time.h" diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index e03173dca8d..6237d336c74 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -20,13 +20,13 @@ #define __COM_IMAGEOPERATION_H__ #include "COM_NodeOperation.h" +#include "MEM_guardedalloc.h" #include "BLI_listbase.h" #include "BKE_image.h" extern "C" { #include "RE_pipeline.h" #include "RE_shader_ext.h" #include "RE_render_ext.h" -#include "MEM_guardedalloc.h" } /** diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index c06994d7cdb..334eab6ef95 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -30,9 +30,9 @@ #include "BKE_scene.h" #include "DNA_color_types.h" +#include "MEM_guardedalloc.h" extern "C" { -#include "MEM_guardedalloc.h" #include "IMB_imbuf.h" #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp index cd2bb3b2928..b91c3324f87 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cpp +++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp @@ -26,8 +26,8 @@ #include "BLI_math_color.h" #include "COM_defines.h" #include "BLI_math.h" -extern "C" { #include "MEM_guardedalloc.h" +extern "C" { #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h index 5aa7e879760..ca7c18a0586 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersProg.h @@ -20,12 +20,12 @@ #define __COM_RENDERLAYERSPROG_H__ #include "COM_NodeOperation.h" +#include "MEM_guardedalloc.h" #include "DNA_scene_types.h" #include "BLI_listbase.h" #include "BKE_image.h" extern "C" { #include "RE_pipeline.h" -#include "MEM_guardedalloc.h" } /** diff --git a/source/blender/compositor/operations/COM_SplitOperation.cpp b/source/blender/compositor/operations/COM_SplitOperation.cpp index 24978acc8f3..437b20d14d4 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.cpp +++ b/source/blender/compositor/operations/COM_SplitOperation.cpp @@ -22,9 +22,9 @@ #include "BLI_utildefines.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "MEM_guardedalloc.h" extern "C" { -#include "MEM_guardedalloc.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" } diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index 934b6f8683f..6b44c11f423 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -22,11 +22,11 @@ #include "COM_NodeOperation.h" #include "DNA_texture_types.h" #include "BLI_listbase.h" +#include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" #include "RE_shader_ext.h" #include "RE_render_ext.h" -#include "MEM_guardedalloc.h" } /** diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index b6caf52a9f7..50b508dafb1 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -26,9 +26,9 @@ #include "BLI_utildefines.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "MEM_guardedalloc.h" extern "C" { -#include "MEM_guardedalloc.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" |