diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 15:58:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 15:58:44 +0300 |
| commit | 30d3d4fbc171abd9d18b0377ddf8742d2c77edb4 (patch) | |
| tree | ad36fc7339f15154cd6839b7913caa23e3c5cfa6 /source/blender/makesdna | |
| parent | 91be94d465ebeebb39bd87ab48761054118ed571 (diff) | |
| parent | ba20da7214e0a71e843b0a6a8b11e0173599a0f0 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 737ea9a7e12..9808740e030 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -35,6 +35,7 @@ blender_include_dirs( set(SRC dna_utils.c makesdna.c + ../../blenlib/intern/BLI_assert.c ../../blenlib/intern/BLI_ghash.c ../../blenlib/intern/BLI_ghash_utils.c ../../blenlib/intern/BLI_memarena.c @@ -126,6 +127,7 @@ set(INC_SYS ) set(SRC + ../../blenlib/intern/BLI_assert.c ../../blenlib/intern/BLI_ghash.c ../../blenlib/intern/BLI_ghash_utils.c ../../blenlib/intern/BLI_linklist.c diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 026274e5b22..628b9bdff75 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -54,6 +54,7 @@ #include "BLI_ghash.h" #include "BLI_memarena.h" #include "BLI_sys_types.h" /* for intptr_t support */ +#include "BLI_system.h" /* for 'BLI_system_backtrace' stub. */ #include "BLI_utildefines.h" #include "dna_utils.h" |