Merged changes in the trunk up to revision 41768.

Conflicts resolved:
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Additional changes:

* source/blender/makesrna/intern/rna_linestyle.c: Fixed white
space issues that generated a number of compiler errors.  The
problem was that two string literals for enumerating MA_RAMP_SOFT
and MA_RAMP_LINEAR contained a space.  The string literals are
supposed to represent a valid C identifier because of their use
for automatic code generation.

* Stroke transparency has been temporarily disabled due to a
functionality conflict with some merged changes.  A fix of this
issue is planned.

13 files changed, 62 insertions, 60 deletions

diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index a46a0079f6b..04dc8717637 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -358,7 +358,7 @@ public:
 	 * @return Returns "unsinged char" from X11 XA_CUT_BUFFER0 buffer
 	 *
 	 */
-	 virtual GHOST_TUns8* getClipboard(bool selection) const = 0;
+	virtual GHOST_TUns8* getClipboard(bool selection) const = 0;
 
 	/**
 	 * Put data to the Clipboard
diff --git a/intern/ghost/GHOST_ISystemPaths.h b/intern/ghost/GHOST_ISystemPaths.h
index 05795d86cc9..804cba721ff 100644
--- a/intern/ghost/GHOST_ISystemPaths.h
+++ b/intern/ghost/GHOST_ISystemPaths.h
@@ -86,12 +86,12 @@ public:
 	  * Determine the directory of the current binary
 	  * @return Unsigned char string pointing to the binary dir
 	  */
-	 virtual const GHOST_TUns8* getBinaryDir() const = 0;
+	virtual const GHOST_TUns8* getBinaryDir() const = 0;
 
-	 /**
-	  * Add the file to the operating system most recently used files
-	  */
-	 virtual void addToSystemRecentFiles(const char* filename) const = 0;
+	/**
+	 * Add the file to the operating system most recently used files
+	 */
+	virtual void addToSystemRecentFiles(const char* filename) const = 0;
 
 private:
 	/** The one and only system paths*/
diff --git a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
index 5ef3bbea942..1449da7b096 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
@@ -88,7 +88,7 @@ GHOST_TSuccess GHOST_DisplayManagerCarbon::getDisplaySetting(GHOST_TUns8 display
 	displayModes = ::CGDisplayAvailableModes(d);
 	//CFIndex numModes = ::CFArrayGetCount(displayModes);/*unused*/
 	//GHOST_TInt32 numSettings = (GHOST_TInt32)numModes; /*unused*/
-	 CFDictionaryRef displayModeValues = (CFDictionaryRef)::CFArrayGetValueAtIndex(displayModes, index);
+	CFDictionaryRef displayModeValues = (CFDictionaryRef)::CFArrayGetValueAtIndex(displayModes, index);
 			
 	setting.xPixels		= getValue(displayModeValues, kCGDisplayWidth);
 	setting.yPixels		= getValue(displayModeValues, kCGDisplayHeight);
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 573ac7dc43d..afd2a8cbae3 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -276,7 +276,7 @@ public:
 	 * @return 				Returns the clipboard data
 	 *
 	 */
-	 virtual GHOST_TUns8* getClipboard(bool selection) const = 0;
+	virtual GHOST_TUns8* getClipboard(bool selection) const = 0;
 	  
 	  /**
 	   * Put data to the Clipboard
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 9dc3dd3f30b..730a7c08151 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -875,24 +875,25 @@ bool GHOST_SystemCocoa::processEvents(bool waitForEvent)
 	/*do {
 		GHOST_TimerManager* timerMgr = getTimerManager();
 		
-		 if (waitForEvent) {
-		 GHOST_TUns64 next = timerMgr->nextFireTime();
-		 double timeOut;
-		 
-		 if (next == GHOST_kFireTimeNever) {
-		 timeOut = kEventDurationForever;
-		 } else {
-		 timeOut = (double)(next - getMilliSeconds())/1000.0;
-		 if (timeOut < 0.0)
-		 timeOut = 0.0;
-		 }
-		 
-		 ::ReceiveNextEvent(0, NULL, timeOut, false, &event);
-		 }
-		 
-		 if (timerMgr->fireTimers(getMilliSeconds())) {
-		 anyProcessed = true;
-		 }*/
+		if (waitForEvent) {
+		GHOST_TUns64 next = timerMgr->nextFireTime();
+		double timeOut;
+
+		if (next == GHOST_kFireTimeNever) {
+		timeOut = kEventDurationForever;
+		} else {
+		timeOut = (double)(next - getMilliSeconds())/1000.0;
+		if (timeOut < 0.0)
+		timeOut = 0.0;
+		}
+
+		::ReceiveNextEvent(0, NULL, timeOut, false, &event);
+		}
+
+		if (timerMgr->fireTimers(getMilliSeconds())) {
+		anyProcessed = true;
+		}
+		*/
 		
 		do {
 			NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.h
index 4ee01e899d0..739fd4edfaf 100644
--- a/intern/ghost/intern/GHOST_SystemPaths.h
+++ b/intern/ghost/intern/GHOST_SystemPaths.h
@@ -68,12 +68,12 @@ public:
 	  * Determine the directory of the current binary
 	  * @return Unsigned char string pointing to the binary dir
 	  */
-	 virtual const GHOST_TUns8* getBinaryDir() const = 0;
+	virtual const GHOST_TUns8* getBinaryDir() const = 0;
 
-	 /**
-	  * Add the file to the operating system most recently used files
-	  */
-	 virtual void addToSystemRecentFiles(const char* filename) const = 0;
+	/**
+	 * Add the file to the operating system most recently used files
+	 */
+	virtual void addToSystemRecentFiles(const char* filename) const = 0;
 
 };
 
diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.h b/intern/ghost/intern/GHOST_SystemPathsCocoa.h
index 14fb65c1282..2b86659c116 100644
--- a/intern/ghost/intern/GHOST_SystemPathsCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.h
@@ -70,12 +70,12 @@ public:
 	  * Determine the directory of the current binary
 	  * @return Unsigned char string pointing to the binary dir
 	  */
-	 virtual const GHOST_TUns8* getBinaryDir() const;
+	virtual const GHOST_TUns8* getBinaryDir() const;
 
-	 /**
-	  * Add the file to the operating system most recently used files
-	  */
-	 void addToSystemRecentFiles(const char* filename) const;
+	/**
+	 * Add the file to the operating system most recently used files
+	 */
+	void addToSystemRecentFiles(const char* filename) const;
 };
 
 #endif // _GHOST_SYSTEM_COCOA_H_
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.h b/intern/ghost/intern/GHOST_SystemPathsWin32.h
index 3b7ce6f9910..dd875d4abea 100644
--- a/intern/ghost/intern/GHOST_SystemPathsWin32.h
+++ b/intern/ghost/intern/GHOST_SystemPathsWin32.h
@@ -74,18 +74,18 @@ public:
 	 * If needed, it will create the base directory.
 	 * @return Unsigned char string pointing to user dir (eg ~/).
 	 */
-	 const GHOST_TUns8* getUserDir() const;
+	const GHOST_TUns8* getUserDir() const;
 
-	 /**
-	  * Determine the directory of the current binary
-	  * @return Unsigned char string pointing to the binary dir
-	  */
-	 const GHOST_TUns8* getBinaryDir() const;
+	/**
+	 * Determine the directory of the current binary
+	 * @return Unsigned char string pointing to the binary dir
+	 */
+	const GHOST_TUns8* getBinaryDir() const;
 
-	 /**
-	  * Add the file to the operating system most recently used files
-	  */
-	 void addToSystemRecentFiles(const char* filename) const;
+	/**
+	 * Add the file to the operating system most recently used files
+	 */
+	void addToSystemRecentFiles(const char* filename) const;
 };
 
 #endif // _GHOST_SYSTEM_PATHS_WIN32_H_
diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.h b/intern/ghost/intern/GHOST_SystemPathsX11.h
index 469f93f5615..a0a1d28a253 100644
--- a/intern/ghost/intern/GHOST_SystemPathsX11.h
+++ b/intern/ghost/intern/GHOST_SystemPathsX11.h
@@ -68,12 +68,12 @@ public:
 	  * Determine the directory of the current binary
 	  * @return Unsigned char string pointing to the binary dir
 	  */
-	 const GHOST_TUns8* getBinaryDir() const;
+	const GHOST_TUns8* getBinaryDir() const;
 
-	 /**
-	  * Add the file to the operating system most recently used files
-	  */
-	 void addToSystemRecentFiles(const char* filename) const;
+	/**
+	 * Add the file to the operating system most recently used files
+	 */
+	void addToSystemRecentFiles(const char* filename) const;
 };
 
 #endif
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index a5799273fde..2547006ef28 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -304,14 +304,15 @@ static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) {
 	FD_SET(fd, &fds);
 
 	if (maxSleep == -1) {
-	    select(fd + 1, &fds, NULL, NULL, NULL);
-	} else {
+		select(fd + 1, &fds, NULL, NULL, NULL);
+	}
+	else {
 		timeval tv;
 
 		tv.tv_sec = maxSleep/1000;
 		tv.tv_usec = (maxSleep - tv.tv_sec*1000)*1000;
 	
-	    select(fd + 1, &fds, NULL, NULL, &tv);
+		select(fd + 1, &fds, NULL, NULL, &tv);
 	}
 }
 
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index d35d91693e2..73d9c95e273 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -218,8 +218,8 @@ public:
 
 	/* Helped function for get data from the clipboard. */
 	void getClipboard_xcout(XEvent evt, Atom sel, Atom target,
-			 unsigned char **txt, unsigned long *len,
-			 unsigned int *context) const;
+	                        unsigned char **txt, unsigned long *len,
+	                        unsigned int *context) const;
 
 	/**
 	 * Returns unsinged char from CUT_BUFFER0
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index cd5eff18be5..a363130c897 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -1046,9 +1046,9 @@ GHOST_TSuccess GHOST_WindowWin32::setWindowCursorGrab(GHOST_TGrabCursorMode mode
 			/* use to generate a mouse move event, otherwise the last event
 			 * blender gets can be outside the screen causing menus not to show
 			 * properly unless the user moves the mouse */
-			 GHOST_TInt32 pos[2];
-			 m_system->getCursorPosition(pos[0], pos[1]);
-			 m_system->setCursorPosition(pos[0], pos[1]);
+			GHOST_TInt32 pos[2];
+			m_system->getCursorPosition(pos[0], pos[1]);
+			m_system->setCursorPosition(pos[0], pos[1]);
 		}
 
 		/* Almost works without but important otherwise the mouse GHOST location can be incorrect on exit */
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
index 23a82cb9fbd..1822f3539bd 100644
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -689,7 +689,7 @@ int main(int /*argc*/, char** /*argv*/)
 		//DWORD keyValue;
 //		lresult = regkey.Open(HKEY_LOCAL_MACHINE, "SOFTWARE\\NVIDIA Corporation\\Global\\Stereo3D\\StereoEnable");
 		lresult = regkey.Open(HKEY_LOCAL_MACHINE, "SOFTWARE\\NVIDIA Corporation\\Global\\Stereo3D\\StereoEnable",
-			 KEY_ALL_ACCESS );
+		                      KEY_ALL_ACCESS);
 
 		if(lresult == ERROR_SUCCESS)
 			printf("Succesfully opened key\n");