diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
commit | af170839afc6334bb3ce9ea62624c6c103707dc6 (patch) | |
tree | f3536c500ad8982ce9d49dcd8014ce37904575a3 /tests | |
parent | 2cdc2f2a2542f31c1c11a9913830f0ff7846888a (diff) | |
parent | b31faac17eaf66e034107f136bb00dd16361a0bf (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/blenlib/BLI_array_utils_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/gtests/blenlib/BLI_array_utils_test.cc b/tests/gtests/blenlib/BLI_array_utils_test.cc index 518cd097326..c4601e00fbd 100644 --- a/tests/gtests/blenlib/BLI_array_utils_test.cc +++ b/tests/gtests/blenlib/BLI_array_utils_test.cc @@ -5,7 +5,7 @@ extern "C" { #include "BLI_utildefines.h" #include "BLI_array_utils.h" -#include "BLI_stackdefines.h" +#include "BLI_utildefines_stack.h" } /* -------------------------------------------------------------------- */ |