Merged changes in the trunk up to revision 47700.

Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h

4 files changed, 16 insertions, 17 deletions

diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index 7614cb80e00..8454f338645 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -56,8 +56,7 @@ typedef unsigned long long GHOST_TUns64;
 
 typedef void *GHOST_TUserDataPtr;
 
-typedef enum
-{
+typedef enum {
 	GHOST_kFailure = 0,
 	GHOST_kSuccess
 } GHOST_TSuccess;
diff --git a/intern/ghost/intern/GHOST_DisplayManagerNULL.h b/intern/ghost/intern/GHOST_DisplayManagerNULL.h
index eb116e30d2d..4d5a0b008dc 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerNULL.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerNULL.h
@@ -41,7 +41,7 @@ public:
 	GHOST_TSuccess getNumDisplaySettings( GHOST_TUns8 display, GHOST_TInt32& numSettings ) const{  return GHOST_kFailure; }
 	GHOST_TSuccess getDisplaySetting( GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting ) const { return GHOST_kFailure; }
 	GHOST_TSuccess getCurrentDisplaySetting( GHOST_TUns8 display, GHOST_DisplaySetting& setting ) const { return getDisplaySetting(display,GHOST_TInt32(0),setting); }
-	GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ) { return GHOST_kSuccess; }
 
 private:
 	GHOST_SystemNULL * m_system;
diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h
index cde2cb0ba76..dcbb7d2b346 100644
--- a/intern/ghost/intern/GHOST_WindowNULL.h
+++ b/intern/ghost/intern/GHOST_WindowNULL.h
@@ -60,27 +60,27 @@ public:
 	}
 
 protected:
-	GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ){ return GHOST_kSuccess; }
-	GHOST_TSuccess removeDrawingContext( ){ return GHOST_kSuccess; }
-	GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ){ return GHOST_kSuccess; }
-	GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ){ return GHOST_kSuccess; }
+	GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ) { return GHOST_kSuccess; }
+	GHOST_TSuccess removeDrawingContext( ) { return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ) { return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ) { return GHOST_kSuccess; }
 	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY ) { return GHOST_kSuccess; }
-	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ) { return GHOST_kSuccess; }
 
 	bool getValid( ) const { return true; }
-	void setTitle( const STR_String& title ){ /* nothing */ }
+	void setTitle( const STR_String& title ) { /* nothing */ }
 	void getTitle( STR_String& title ) const { title= "untitled"; }
 	void getWindowBounds( GHOST_Rect& bounds ) const { getClientBounds(bounds); }
 	void getClientBounds( GHOST_Rect& bounds ) const { /* nothing */ }
-	GHOST_TSuccess setClientWidth( GHOST_TUns32 width ){ return GHOST_kFailure; }
-	GHOST_TSuccess setClientHeight( GHOST_TUns32 height ){ return GHOST_kFailure;  }
-	GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ){ return GHOST_kFailure;  }
+	GHOST_TSuccess setClientWidth( GHOST_TUns32 width ) { return GHOST_kFailure; }
+	GHOST_TSuccess setClientHeight( GHOST_TUns32 height ) { return GHOST_kFailure;  }
+	GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ) { return GHOST_kFailure;  }
 	void screenToClient( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
 	void clientToScreen( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
-	GHOST_TSuccess swapBuffers( ){ return GHOST_kFailure; }
-	GHOST_TSuccess activateDrawingContext( ){ return GHOST_kFailure; }
-	~GHOST_WindowNULL( ){ /* nothing */ }
-	GHOST_TSuccess setWindowCursorVisibility( bool visible ){ return GHOST_kSuccess; }
+	GHOST_TSuccess swapBuffers( ) { return GHOST_kFailure; }
+	GHOST_TSuccess activateDrawingContext( ) { return GHOST_kFailure; }
+	~GHOST_WindowNULL( ) { /* nothing */ }
+	GHOST_TSuccess setWindowCursorVisibility( bool visible ) { return GHOST_kSuccess; }
 	GHOST_TSuccess setState(GHOST_TWindowState state)  { return GHOST_kSuccess; }
 	GHOST_TWindowState getState() const	{ return GHOST_kWindowStateNormal; }
 	GHOST_TSuccess invalidate()  { return GHOST_kSuccess; }
diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c
index f988f0fb86a..034fbe04447 100644
--- a/intern/ghost/test/multitest/EventToBuf.c
+++ b/intern/ghost/test/multitest/EventToBuf.c
@@ -36,7 +36,7 @@
 
 char *eventtype_to_string(GHOST_TEventType type)
 {
-	switch(type) {
+	switch (type) {
 	case GHOST_kEventCursorMove:		return "CursorMove";
 	case GHOST_kEventButtonDown:		return "ButtonDown";
 	case GHOST_kEventButtonUp:			return "ButtonUp";