diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
| commit | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (patch) | |
| tree | f03a5935ee7dbc4c7ddabaee1c06570a26f698f9 /source/blender/io/collada/ExtraTags.cpp | |
| parent | 390c4efa0c15b39e2d1971bc81464cffae56d102 (diff) | |
| parent | e795ba1529a28ec276a5178fda2025e5ec071bbf (diff) | |
Merge remote-tracking branch 'origin/master' into geometry-nodes
Diffstat (limited to 'source/blender/io/collada/ExtraTags.cpp')
| -rw-r--r-- | source/blender/io/collada/ExtraTags.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/io/collada/ExtraTags.cpp b/source/blender/io/collada/ExtraTags.cpp index d8fbf96db51..8c63a21f88a 100644 --- a/source/blender/io/collada/ExtraTags.cpp +++ b/source/blender/io/collada/ExtraTags.cpp @@ -19,8 +19,8 @@ */ #include "BLI_string.h" -#include <stddef.h> -#include <stdlib.h> +#include <cstddef> +#include <cstdlib> #include <iostream> |