diff options
| author | Sam Kottler <dev@samkottler.net> | 2020-08-13 17:58:33 +0300 |
|---|---|---|
| committer | Sam Kottler <dev@samkottler.net> | 2020-08-13 17:58:33 +0300 |
| commit | 7c38d008de5ebdcb96ebdd67b8dc459d5551702f (patch) | |
| tree | 8fb22f60bc31019e3fe8f5b2bf35159c2e32cda9 /source/blender/editors/space_info | |
| parent | cc86e03fd52cd68e66b817590aac80ec2a358d3e (diff) | |
| parent | 4e103101f7a20eaa2a61306a1070a04b63a69958 (diff) | |
Merge branch 'blender-v2.90-release' into soc-2020-production-ready-light-tree-2
Diffstat (limited to 'source/blender/editors/space_info')
| -rw-r--r-- | source/blender/editors/space_info/info_intern.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_info/textview.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/editors/space_info/info_intern.h b/source/blender/editors/space_info/info_intern.h index 79bfb1fa047..a19ebe5ef04 100644 --- a/source/blender/editors/space_info/info_intern.h +++ b/source/blender/editors/space_info/info_intern.h @@ -21,8 +21,7 @@ * \ingroup spinfo */ -#ifndef __INFO_INTERN_H__ -#define __INFO_INTERN_H__ +#pragma once /* internal exports only */ @@ -65,5 +64,3 @@ void INFO_OT_select_box(struct wmOperatorType *ot); void INFO_OT_report_replay(struct wmOperatorType *ot); void INFO_OT_report_delete(struct wmOperatorType *ot); void INFO_OT_report_copy(struct wmOperatorType *ot); - -#endif /* __INFO_INTERN_H__ */ diff --git a/source/blender/editors/space_info/textview.h b/source/blender/editors/space_info/textview.h index 41f8baf634e..7520dbce191 100644 --- a/source/blender/editors/space_info/textview.h +++ b/source/blender/editors/space_info/textview.h @@ -18,8 +18,7 @@ * \ingroup spinfo */ -#ifndef __TEXTVIEW_H__ -#define __TEXTVIEW_H__ +#pragma once enum eTextViewContext_LineFlag { TVC_LINE_FG = (1 << 0), @@ -79,5 +78,3 @@ int textview_draw(struct TextViewContext *tvc, const int mval_init[2], void **r_mval_pick_item, int *r_mval_pick_offset); - -#endif /* __TEXTVIEW_H__ */ |