Merge branch 'master' into blender2.8

12 files changed, 0 insertions, 12 deletions

diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h
index f91e7d42bca..e2e110ffc31 100644
--- a/source/blender/editors/include/BIF_gl.h
+++ b/source/blender/editors/include/BIF_gl.h
@@ -48,4 +48,3 @@
 #define GLA_PIXEL_OFS 0.375f
 
 #endif /* #ifdef __BIF_GL_H__ */
-
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index fee336ea768..59a54f03e56 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -724,4 +724,3 @@ void ED_drivers_editor_init(struct bContext *C, struct ScrArea *sa);
 /* ************************************************ */
 
 #endif /* __ED_ANIM_API_H__ */
-
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index 1559fc8f302..7d509d1243a 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -242,4 +242,3 @@ extern char datatoc_mc24_jpg[];
 
 
 #endif /* __ED_DATAFILES_H__ */
-
diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index f2b7d2cb4a1..64739d968b8 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -156,4 +156,3 @@ char *ED_fsmenu_entry_get_name(struct FSMenuEntry *fsentry);
 void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name);
 
 #endif /* __ED_FILESELECT_H__ */
-
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index 73926b8a687..ed9102a2d8b 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -85,4 +85,3 @@ void ED_image_draw_info(struct Scene *scene, struct ARegion *ar, bool color_mana
 bool ED_space_image_show_cache(struct SpaceImage *sima);
 
 #endif /* __ED_IMAGE_H__ */
-
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index 0b3ce144097..8d652609fbc 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -110,4 +110,3 @@ void ED_operatormacros_node(void);
 bool ED_space_node_color_sample(struct Main *bmain, struct SpaceNode *snode, struct ARegion *ar, int mval[2], float r_col[3]);
 
 #endif /* __ED_NODE_H__ */
-
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 8b522c91188..b50250dfb96 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -71,4 +71,3 @@ void PE_deselect_all_visible(struct PTCacheEdit *edit);
 void ED_particle_undosys_type(struct UndoType *ut);
 
 #endif /* __ED_PARTICLE_H__ */
-
diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h
index fed842c969e..70b54a64d6b 100644
--- a/source/blender/editors/include/ED_physics.h
+++ b/source/blender/editors/include/ED_physics.h
@@ -57,4 +57,3 @@ void ED_operatortypes_physics(void);
 void ED_keymap_physics(struct wmKeyConfig *keyconf);
 
 #endif /* __ED_PHYSICS_H__ */
-
diff --git a/source/blender/editors/include/ED_sound.h b/source/blender/editors/include/ED_sound.h
index 87ab9041305..b4b424b0318 100644
--- a/source/blender/editors/include/ED_sound.h
+++ b/source/blender/editors/include/ED_sound.h
@@ -34,4 +34,3 @@
 void ED_operatortypes_sound(void);
 
 #endif /* __ED_SOUND_H__ */
-
diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h
index 37744e7eb0f..7995644f39e 100644
--- a/source/blender/editors/include/ED_undo.h
+++ b/source/blender/editors/include/ED_undo.h
@@ -68,4 +68,3 @@ void ED_undosys_type_free(void);
 struct MemFile *ED_undosys_stack_memfile_get_active(struct UndoStack *ustack);
 
 #endif /* __ED_UNDO_H__ */
-
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index 3a35bddeb77..7e91b5b88c1 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -55,4 +55,3 @@ void apply_keyb_grid(int shift, int ctrl, float *val, float fac1, float fac2, fl
 void unpack_menu(struct bContext *C, const char *opname, const char *id_name, const char *abs_name, const char *folder, struct PackedFile *pf);
 
 #endif /* __ED_UTIL_H__ */
-
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index e6cd276e5c7..434e9cfe2ac 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -145,4 +145,3 @@ void ED_uvedit_draw_main(
 void ED_uvedit_buttons_register(struct ARegionType *art);
 
 #endif /* __ED_UVEDIT_H__ */
-