diff options
| author | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
| commit | f7770cb97bb9d19d0806f67da9377129fd4d09b0 (patch) | |
| tree | 2cd22d612ffba3a509d5548332c9cc8a06a1a638 /source/blender/alembic/intern/abc_curves.cc | |
| parent | b47883a990ee68e659a8a8b44729be9b8e0d002f (diff) | |
| parent | dc3f073d1c5255e79763dfff3ef17f6216f1b391 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
Diffstat (limited to 'source/blender/alembic/intern/abc_curves.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_curves.cc | 2 |
1 files changed, 1 insertions, 1 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" |