Merge branch 'master' into blender2.8

47 files changed, 0 insertions, 50 deletions

diff --git a/intern/ghost/GHOST_IContext.h b/intern/ghost/GHOST_IContext.h
index 5b027a614ab..22b63486398 100644
--- a/intern/ghost/GHOST_IContext.h
+++ b/intern/ghost/GHOST_IContext.h
@@ -75,4 +75,3 @@ public:
 };
 
 #endif // __GHOST_IContext_H__
-
diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h
index 83273716950..2842e009493 100644
--- a/intern/ghost/GHOST_IEvent.h
+++ b/intern/ghost/GHOST_IEvent.h
@@ -91,4 +91,3 @@ public:
 };
 
 #endif // __GHOST_IEVENT_H__
-
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index 1a6c0f9a1bf..07273c40d17 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -462,4 +462,3 @@ protected:
 };
 
 #endif // __GHOST_ISYSTEM_H__
-
diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h
index dd3db5623cc..6ae62952e98 100644
--- a/intern/ghost/GHOST_ITimerTask.h
+++ b/intern/ghost/GHOST_ITimerTask.h
@@ -91,4 +91,3 @@ public:
 };
 
 #endif // __GHOST_ITIMERTASK_H__
-
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index 5a3403bcbd3..b2f9fe24944 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -368,4 +368,3 @@ public:
 };
 
 #endif // __GHOST_IWINDOW_H__
-
diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h
index c2ea8db0a66..7906d169cda 100644
--- a/intern/ghost/GHOST_Rect.h
+++ b/intern/ghost/GHOST_Rect.h
@@ -257,4 +257,3 @@ inline bool GHOST_Rect::isInside(GHOST_TInt32 x, GHOST_TInt32 y) const
 }
 
 #endif // __GHOST_RECT_H__
-
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index b206bb677a7..1fc1d1a3e56 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -557,4 +557,3 @@ typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, GHOST_T
 #endif
 
 #endif // __GHOST_TYPES_H__
-
diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h
index aed9a3cc81f..d9d4e4a32b9 100644
--- a/intern/ghost/intern/GHOST_Buttons.h
+++ b/intern/ghost/intern/GHOST_Buttons.h
@@ -75,4 +75,3 @@ struct GHOST_Buttons {
 };
 
 #endif // __GHOST_BUTTONS_H__
-
diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h
index 3505d651fa3..789ce1e1a72 100644
--- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h
+++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h
@@ -80,4 +80,3 @@ protected:
 };
 
 #endif // __GHOST_CALLBACKEVENTCONSUMER_H__
-
diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h
index 658c9bf5d2c..b899027f051 100644
--- a/intern/ghost/intern/GHOST_Debug.h
+++ b/intern/ghost/intern/GHOST_Debug.h
@@ -84,4 +84,3 @@
 #endif // GHOST_DEBUG
 
 #endif // __GHOST_DEBUG_H__
-
diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h
index 02a742a54db..20d724f6106 100644
--- a/intern/ghost/intern/GHOST_DisplayManager.h
+++ b/intern/ghost/intern/GHOST_DisplayManager.h
@@ -142,4 +142,3 @@ protected:
 
 
 #endif // __GHOST_DISPLAYMANAGER_H__
-
diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h b/intern/ghost/intern/GHOST_DisplayManagerCocoa.h
index 3ce0b4e2239..17343cb901d 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.h
@@ -103,4 +103,3 @@ protected:
 
 
 #endif // __GHOST_DISPLAYMANAGERCOCOA_H__
-
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.h b/intern/ghost/intern/GHOST_DisplayManagerWin32.h
index f0d6d62083c..997accf7e96 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.h
@@ -98,4 +98,3 @@ protected:
 
 
 #endif // __GHOST_DISPLAYMANAGERWIN32_H__
-
diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.h b/intern/ghost/intern/GHOST_DisplayManagerX11.h
index 857a8a5fce8..e330e7756e3 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerX11.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerX11.h
@@ -120,4 +120,3 @@ private:
 
 
 #endif //
-
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cpp
index 79d7a2d48b4..de12dfad815 100644
--- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp
+++ b/intern/ghost/intern/GHOST_DropTargetWin32.cpp
@@ -392,4 +392,3 @@ void printLastError(void)
 	}
 }
 #endif // GHOST_DEBUG
-
diff --git a/intern/ghost/intern/GHOST_Event.h b/intern/ghost/intern/GHOST_Event.h
index 278870738c2..a0aef6550eb 100644
--- a/intern/ghost/intern/GHOST_Event.h
+++ b/intern/ghost/intern/GHOST_Event.h
@@ -104,4 +104,3 @@ protected:
 };
 
 #endif // __GHOST_EVENT_H__
-
diff --git a/intern/ghost/intern/GHOST_EventButton.h b/intern/ghost/intern/GHOST_EventButton.h
index ef5c5efa202..2f004c3ca00 100644
--- a/intern/ghost/intern/GHOST_EventButton.h
+++ b/intern/ghost/intern/GHOST_EventButton.h
@@ -63,4 +63,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTBUTTON_H__
-
diff --git a/intern/ghost/intern/GHOST_EventCursor.h b/intern/ghost/intern/GHOST_EventCursor.h
index 1c6f762cd9e..05b1caee081 100644
--- a/intern/ghost/intern/GHOST_EventCursor.h
+++ b/intern/ghost/intern/GHOST_EventCursor.h
@@ -65,4 +65,3 @@ protected:
 
 
 #endif // __GHOST_EVENTCURSOR_H__
-
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h b/intern/ghost/intern/GHOST_EventDragnDrop.h
index c9f4f08b53c..2f10c2e8f99 100644
--- a/intern/ghost/intern/GHOST_EventDragnDrop.h
+++ b/intern/ghost/intern/GHOST_EventDragnDrop.h
@@ -133,4 +133,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTDRAGNDROP_H__
-
diff --git a/intern/ghost/intern/GHOST_EventKey.h b/intern/ghost/intern/GHOST_EventKey.h
index 7e867596503..8052625496a 100644
--- a/intern/ghost/intern/GHOST_EventKey.h
+++ b/intern/ghost/intern/GHOST_EventKey.h
@@ -89,4 +89,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTKEY_H__
-
diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h
index efad19616ad..651dd29536e 100644
--- a/intern/ghost/intern/GHOST_EventManager.h
+++ b/intern/ghost/intern/GHOST_EventManager.h
@@ -161,4 +161,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTMANAGER_H__
-
diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp
index 221b85b80ba..359db162c04 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.cpp
+++ b/intern/ghost/intern/GHOST_EventPrinter.cpp
@@ -338,4 +338,3 @@ void GHOST_EventPrinter::getKeyString(GHOST_TKey key, char str[32]) const
 		sprintf(str, "%s", tstr);
 	}
 }
-
diff --git a/intern/ghost/intern/GHOST_EventPrinter.h b/intern/ghost/intern/GHOST_EventPrinter.h
index 0cbb7ca467d..d4c49ae8294 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.h
+++ b/intern/ghost/intern/GHOST_EventPrinter.h
@@ -61,4 +61,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTPRINTER_H__
-
diff --git a/intern/ghost/intern/GHOST_EventString.h b/intern/ghost/intern/GHOST_EventString.h
index 391af0f8e2d..a0cb35bead6 100644
--- a/intern/ghost/intern/GHOST_EventString.h
+++ b/intern/ghost/intern/GHOST_EventString.h
@@ -64,4 +64,3 @@ public:
 };
 
 #endif // __GHOST_EVENTSTRING_H__
-
diff --git a/intern/ghost/intern/GHOST_EventTrackpad.h b/intern/ghost/intern/GHOST_EventTrackpad.h
index b4e80b5fd06..faf0f1697d0 100644
--- a/intern/ghost/intern/GHOST_EventTrackpad.h
+++ b/intern/ghost/intern/GHOST_EventTrackpad.h
@@ -72,4 +72,3 @@ protected:
 
 
 #endif // _GHOST_EVENT_PAN_H_
-
diff --git a/intern/ghost/intern/GHOST_EventWheel.h b/intern/ghost/intern/GHOST_EventWheel.h
index a632492acb9..c4e1c1af38c 100644
--- a/intern/ghost/intern/GHOST_EventWheel.h
+++ b/intern/ghost/intern/GHOST_EventWheel.h
@@ -65,4 +65,3 @@ protected:
 
 
 #endif // __GHOST_EVENTWHEEL_H__
-
diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp
index 37d5926ffc2..21cec19328e 100644
--- a/intern/ghost/intern/GHOST_ISystem.cpp
+++ b/intern/ghost/intern/GHOST_ISystem.cpp
@@ -105,4 +105,3 @@ GHOST_ISystem *GHOST_ISystem::getSystem()
 {
 	return m_system;
 }
-
diff --git a/intern/ghost/intern/GHOST_ISystemPaths.cpp b/intern/ghost/intern/GHOST_ISystemPaths.cpp
index 8bd7fbe4f9b..57062a76fd5 100644
--- a/intern/ghost/intern/GHOST_ISystemPaths.cpp
+++ b/intern/ghost/intern/GHOST_ISystemPaths.cpp
@@ -96,6 +96,3 @@ GHOST_ISystemPaths *GHOST_ISystemPaths::get()
 	}
 	return m_systemPaths;
 }
-
-
-
diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.h
index a30b66c4634..72bcbcb5e01 100644
--- a/intern/ghost/intern/GHOST_ModifierKeys.h
+++ b/intern/ghost/intern/GHOST_ModifierKeys.h
@@ -100,4 +100,3 @@ struct GHOST_ModifierKeys {
 };
 
 #endif // __GHOST_MODIFIERKEYS_H__
-
diff --git a/intern/ghost/intern/GHOST_Rect.cpp b/intern/ghost/intern/GHOST_Rect.cpp
index 646dae9f242..780ac9aaf53 100644
--- a/intern/ghost/intern/GHOST_Rect.cpp
+++ b/intern/ghost/intern/GHOST_Rect.cpp
@@ -138,4 +138,3 @@ bool GHOST_Rect::clip(GHOST_Rect& r) const
 	}
 	return clipped;
 }
-
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp
index f849993ae6d..0629eacc3ff 100644
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cpp
@@ -390,4 +390,3 @@ bool GHOST_System::useNativePixel(void)
 	m_nativePixel = true;
 	return 1;
 }
-
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 6831b3d07d9..2fd8603516d 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -396,4 +396,3 @@ inline GHOST_NDOFManager *GHOST_System::getNDOFManager() const
 #endif
 
 #endif // __GHOST_SYSTEM_H__
-
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h
index f0702737b46..57b6a683c71 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemCocoa.h
@@ -323,4 +323,3 @@ protected:
 };
 
 #endif // __GHOST_SYSTEMCOCOA_H__
-
diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.h
index fbaa8ad8ba5..25e696fc081 100644
--- a/intern/ghost/intern/GHOST_SystemPaths.h
+++ b/intern/ghost/intern/GHOST_SystemPaths.h
@@ -77,5 +77,3 @@ public:
 };
 
 #endif
-
-
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.h b/intern/ghost/intern/GHOST_SystemPathsWin32.h
index 5685a57eba8..caa90a956aa 100644
--- a/intern/ghost/intern/GHOST_SystemPathsWin32.h
+++ b/intern/ghost/intern/GHOST_SystemPathsWin32.h
@@ -90,4 +90,3 @@ public:
 };
 
 #endif // __GHOST_SYSTEMPATHSWIN32_H__
-
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index d318b894d87..4564bebe4fc 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -438,4 +438,3 @@ private:
 };
 
 #endif
-
diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.h
index 78026a743eb..8a06b37c73a 100644
--- a/intern/ghost/intern/GHOST_TimerManager.h
+++ b/intern/ghost/intern/GHOST_TimerManager.h
@@ -127,4 +127,3 @@ protected:
 };
 
 #endif // __GHOST_TIMERMANAGER_H__
-
diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.h
index fa35fd134f5..bf28700ad58 100644
--- a/intern/ghost/intern/GHOST_TimerTask.h
+++ b/intern/ghost/intern/GHOST_TimerTask.h
@@ -193,4 +193,3 @@ protected:
 };
 
 #endif // __GHOST_TIMERTASK_H__
-
diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cpp
index 6596028d5a1..6931ede067e 100644
--- a/intern/ghost/intern/GHOST_Window.cpp
+++ b/intern/ghost/intern/GHOST_Window.cpp
@@ -242,4 +242,3 @@ bool GHOST_Window::getModifiedState()
 {
 	return m_isUnsavedChanges;
 }
-
diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h
index 413a3315225..e6a4682ee7c 100644
--- a/intern/ghost/intern/GHOST_Window.h
+++ b/intern/ghost/intern/GHOST_Window.h
@@ -461,4 +461,3 @@ inline GHOST_TStandardCursor GHOST_Window::getCursorShape() const
 }
 
 #endif // _GHOST_WINDOW_H
-
diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h
index a7dde2af39c..46a1e6c09cd 100644
--- a/intern/ghost/intern/GHOST_WindowManager.h
+++ b/intern/ghost/intern/GHOST_WindowManager.h
@@ -168,4 +168,3 @@ protected:
 };
 
 #endif // __GHOST_WINDOWMANAGER_H__
-
diff --git a/intern/ghost/test/multitest/Basic.h b/intern/ghost/test/multitest/Basic.h
index 86d68ef06cb..3b550af609a 100644
--- a/intern/ghost/test/multitest/Basic.h
+++ b/intern/ghost/test/multitest/Basic.h
@@ -38,4 +38,3 @@ void	rect_copy			(int dst[2][2], int src[2][2]);
 int		rect_contains_pt	(int rect[2][2], int pt[2]);
 int		rect_width			(int rect[2][2]);
 int		rect_height			(int rect[2][2]);
-
diff --git a/intern/ghost/test/multitest/EventToBuf.h b/intern/ghost/test/multitest/EventToBuf.h
index 23b61a4cf2a..9eb24970584 100644
--- a/intern/ghost/test/multitest/EventToBuf.h
+++ b/intern/ghost/test/multitest/EventToBuf.h
@@ -27,4 +27,3 @@
 
 char *eventtype_to_string(GHOST_TEventType type);
 void event_to_buf(GHOST_EventHandle evt, char buf[128]);
-
diff --git a/intern/ghost/test/multitest/GL.h b/intern/ghost/test/multitest/GL.h
index 4a82623f9f9..292fc5b37ca 100644
--- a/intern/ghost/test/multitest/GL.h
+++ b/intern/ghost/test/multitest/GL.h
@@ -37,4 +37,3 @@
 #else // defined(WIN32) || defined(__APPLE__)
 	#include <GL/gl.h>
 #endif // defined(WIN32) || defined(__APPLE__)
-
diff --git a/intern/ghost/test/multitest/ScrollBar.h b/intern/ghost/test/multitest/ScrollBar.h
index dd737539bf2..752ed9056b8 100644
--- a/intern/ghost/test/multitest/ScrollBar.h
+++ b/intern/ghost/test/multitest/ScrollBar.h
@@ -50,4 +50,3 @@ void		scrollbar_get_rect			(ScrollBar *sb, int rect_r[2][2]);
 void		scrollbar_get_thumb			(ScrollBar *sb, int thumb_r[2][2]);
 
 void		scrollbar_free				(ScrollBar *sb);
-
diff --git a/intern/ghost/test/multitest/Util.h b/intern/ghost/test/multitest/Util.h
index 4652a0bbf4d..87ec72f5e89 100644
--- a/intern/ghost/test/multitest/Util.h
+++ b/intern/ghost/test/multitest/Util.h
@@ -29,4 +29,3 @@ void*	memdbl		(void *mem, int *size_pr, int item_size);
 
 char*	string_dup	(char *str);
 void	fatal		(char *fmt, ...);
-
diff --git a/intern/ghost/test/multitest/WindowData.h b/intern/ghost/test/multitest/WindowData.h
index 0e6c7518843..ca8199bddd8 100644
--- a/intern/ghost/test/multitest/WindowData.h
+++ b/intern/ghost/test/multitest/WindowData.h
@@ -33,4 +33,3 @@ typedef struct _WindowData WindowData;
 WindowData*	windowdata_new		(void *data, WindowDataHandler handler);
 void		windowdata_handle	(WindowData *wb, GHOST_EventHandle evt);
 void		windowdata_free		(WindowData *wb);
-