Merge branch 'master' into blender2.8

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h
index eedd5336fb8..ddd8b59c264 100644
--- a/source/blender/editors/include/ED_space_api.h
+++ b/source/blender/editors/include/ED_space_api.h
@@ -60,7 +60,7 @@ void ED_spacetype_clip(void);
 void ED_spacetype_statusbar(void);
 void ED_spacetype_topbar(void);
 
-/* calls for instancing and freeing spacetype static data 
+/* calls for instancing and freeing spacetype static data
  * called in WM_init_exit */
 /* in space_file.c */
 void ED_file_init(void);
@@ -70,7 +70,7 @@ void ED_file_exit(void);
 #define REGION_DRAW_POST_PIXEL  1
 #define REGION_DRAW_PRE_VIEW    2
 
-void *ED_region_draw_cb_activate(struct ARegionType *, 
+void *ED_region_draw_cb_activate(struct ARegionType *,
                                  void (*draw)(const struct bContext *, struct ARegion *, void *),
                                  void *custumdata, int type);
 void ED_region_draw_cb_draw(const struct bContext *, struct ARegion *, int);