diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
| commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
| tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/editors/space_text | |
| parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
| parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors/space_text')
| -rw-r--r-- | source/blender/editors/space_text/text_format.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_text/text_intern.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/editors/space_text/text_format.h b/source/blender/editors/space_text/text_format.h index 07635e4227a..bb9574ee55e 100644 --- a/source/blender/editors/space_text/text_format.h +++ b/source/blender/editors/space_text/text_format.h @@ -21,8 +21,7 @@ * \ingroup sptext */ -#ifndef __TEXT_FORMAT_H__ -#define __TEXT_FORMAT_H__ +#pragma once /* *** Flatten String *** */ typedef struct FlattenString { @@ -110,5 +109,3 @@ void ED_text_format_register_pov_ini(void); #define STR_LITERAL_STARTSWITH(str, str_literal, len_var) \ (strncmp(str, str_literal, len_var = (sizeof(str_literal) - 1)) == 0) - -#endif /* __TEXT_FORMAT_H__ */ diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index d6588dda797..abafad4c241 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -21,8 +21,7 @@ * \ingroup sptext */ -#ifndef __TEXT_INTERN_H__ -#define __TEXT_INTERN_H__ +#pragma once /* internal exports only */ @@ -181,5 +180,3 @@ void TEXT_OT_autocomplete(struct wmOperatorType *ot); /* space_text.c */ extern const char *text_context_dir[]; /* doc access */ - -#endif /* __TEXT_INTERN_H__ */ |