diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/space_text | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_text')
-rw-r--r-- | source/blender/editors/space_text/space_text.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_header.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_intern.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index f57a1c0eb89..4e61e4d94aa 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -641,4 +641,3 @@ void ED_spacetype_text(void) ED_text_format_register_pov(); ED_text_format_register_pov_ini(); } - diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index 3d964d07908..3229d164f27 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -212,4 +212,3 @@ void TEXT_OT_start_find(wmOperatorType *ot) UI_popup_menu_end(C, pup); } #endif - diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index bc902135b50..56ce62d0b14 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -151,4 +151,3 @@ void TEXT_OT_autocomplete(struct wmOperatorType *ot); extern const char *text_context_dir[]; /* doc access */ #endif /* __TEXT_INTERN_H__ */ - |