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/alembic/intern | |
parent | 9cacadc8a637cc6c96380f73c4bfd1d6967351bd (diff) |
Fix OBJECT_GUARDED_FREE compiler error when type is in namespace
Diffstat (limited to 'source/blender/alembic/intern')
-rw-r--r-- | source/blender/alembic/intern/abc_curves.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_hair.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_mball.cc | 3 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 4 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_nurbs.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc index 50aa13bea4f..3b143356c04 100644 --- a/source/blender/alembic/intern/abc_curves.cc +++ b/source/blender/alembic/intern/abc_curves.cc @@ -28,9 +28,9 @@ #include "abc_transform.h" #include "abc_util.h" -extern "C" { #include "MEM_guardedalloc.h" +extern "C" { #include "DNA_curve_types.h" #include "DNA_object_types.h" diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc index 98387be2e61..7eaecd271f4 100644 --- a/source/blender/alembic/intern/abc_hair.cc +++ b/source/blender/alembic/intern/abc_hair.cc @@ -25,9 +25,9 @@ #include "abc_transform.h" #include "abc_util.h" -extern "C" { #include "MEM_guardedalloc.h" +extern "C" { #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" diff --git a/source/blender/alembic/intern/abc_mball.cc b/source/blender/alembic/intern/abc_mball.cc index 732ceffe467..db4b9d82ebf 100644 --- a/source/blender/alembic/intern/abc_mball.cc +++ b/source/blender/alembic/intern/abc_mball.cc @@ -22,6 +22,8 @@ #include "abc_mesh.h" #include "abc_transform.h" +#include "MEM_guardedalloc.h" + extern "C" { #include "DNA_meta_types.h" #include "DNA_mesh_types.h" @@ -35,7 +37,6 @@ extern "C" { #include "BKE_object.h" #include "DEG_depsgraph.h" -#include "MEM_guardedalloc.h" } AbcMBallWriter::AbcMBallWriter(Main *bmain, diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index edcb6263da3..3eee390d7d3 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -25,6 +25,8 @@ #include "abc_transform.h" #include "abc_util.h" +#include "MEM_guardedalloc.h" + extern "C" { #include "DNA_material_types.h" #include "DNA_mesh_types.h" @@ -46,8 +48,6 @@ extern "C" { #include "BKE_modifier.h" #include "BKE_object.h" -#include "MEM_guardedalloc.h" - #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc index 739276dffa6..c11ca7d57b9 100644 --- a/source/blender/alembic/intern/abc_nurbs.cc +++ b/source/blender/alembic/intern/abc_nurbs.cc @@ -23,9 +23,9 @@ #include "abc_transform.h" #include "abc_util.h" -extern "C" { #include "MEM_guardedalloc.h" +extern "C" { #include "DNA_curve_types.h" #include "DNA_object_types.h" diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 5efa8c8a446..5519cbef53c 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -32,9 +32,9 @@ #include "abc_transform.h" #include "abc_util.h" -extern "C" { #include "MEM_guardedalloc.h" +extern "C" { #include "DNA_cachefile_types.h" #include "DNA_curve_types.h" #include "DNA_modifier_types.h" |