svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender

8 files changed, 77 insertions, 34 deletions

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index ab88c9ecabd..7eef13b103b 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -22,9 +22,9 @@
 
 set(INC
 	.
-	intern
 	FX
 	SRC
+	intern
 	../ffmpeg
 )
 
@@ -159,8 +159,12 @@ set(SRC
 
 if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
-	list(APPEND INC ffmpeg)
-	list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+	list(APPEND INC
+		ffmpeg
+	)
+	list(APPEND INC_SYS
+		${FFMPEG_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		ffmpeg/AUD_FFMPEGFactory.cpp
 		ffmpeg/AUD_FFMPEGReader.cpp
@@ -172,8 +176,12 @@ endif()
 
 if(WITH_SDL)
 	add_definitions(-DWITH_SDL)
-	list(APPEND INC SDL)
-	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+	list(APPEND INC
+		SDL
+	)
+	list(APPEND INC_SYS
+		${SDL_INCLUDE_DIR}
+	)
 	list(APPEND SRC
 		SDL/AUD_SDLDevice.cpp
 
@@ -183,8 +191,12 @@ endif()
 
 if(WITH_OPENAL)
 	add_definitions(-DWITH_OPENAL)
-	list(APPEND INC OpenAL)
-	list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR})
+	list(APPEND INC
+		OpenAL
+	)
+	list(APPEND INC_SYS
+		${OPENAL_INCLUDE_DIR}
+	)
 	list(APPEND SRC
 		OpenAL/AUD_OpenALDevice.cpp
 
@@ -194,8 +206,12 @@ endif()
 
 if(WITH_JACK)
 	add_definitions(-DWITH_JACK)
-	list(APPEND INC jack)
-	list(APPEND INC_SYS ${JACK_INCLUDE_DIRS})
+	list(APPEND INC
+		jack
+	)
+	list(APPEND INC_SYS
+		${JACK_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		jack/AUD_JackDevice.cpp
 
@@ -205,8 +221,12 @@ endif()
 
 if(WITH_CODEC_SNDFILE)
 	add_definitions(-DWITH_SNDFILE)
-	list(APPEND INC sndfile)
-	list(APPEND INC_SYS ${SNDFILE_INCLUDE_DIRS})
+	list(APPEND INC
+		sndfile
+	)
+	list(APPEND INC_SYS
+		${SNDFILE_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		sndfile/AUD_SndFileFactory.cpp
 		sndfile/AUD_SndFileReader.cpp
@@ -218,7 +238,9 @@ endif()
 
 if(WITH_SAMPLERATE)
 	add_definitions(-DWITH_SAMPLERATE)
-	list(APPEND INC_SYS ${SAMPLERATE_INCLUDE_DIRS})
+	list(APPEND INC_SYS
+		${SAMPLERATE_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		SRC/AUD_SRCResampleFactory.cpp
 		SRC/AUD_SRCResampleReader.cpp
@@ -230,8 +252,12 @@ endif()
 
 if(WITH_FFTW3 AND FALSE)
 	add_definitions(-DWITH_FFTW3)
-	list(APPEND INC fftw)
-	list(APPEND INC_SYS ${FFTW3_INCLUDE_DIRS})
+	list(APPEND INC
+		fftw
+	)
+	list(APPEND INC_SYS
+		${FFTW3_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		fftw/AUD_BandPassFactory.cpp
 		fftw/AUD_BandPassReader.cpp
@@ -242,8 +268,12 @@ if(WITH_FFTW3 AND FALSE)
 endif()
 
 if(WITH_PYTHON)
-	list(APPEND INC Python)
-	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+	list(APPEND INC
+		Python
+	)
+	list(APPEND INC_SYS
+		${PYTHON_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		Python/AUD_PyAPI.cpp
 
diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt
index 7a95d556172..742c0f1d42c 100644
--- a/intern/boolop/CMakeLists.txt
+++ b/intern/boolop/CMakeLists.txt
@@ -26,11 +26,11 @@
 
 set(INC	
 	.
-	./intern
-	./extern
-	../memutil
+	extern
+	intern
 	../container
 	../guardedalloc
+	../memutil
 	../moto/include
 	../../source/blender/blenlib
 	../../source/blender/makesdna
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt
index 792f6aa1327..a844db3257e 100644
--- a/intern/bsp/CMakeLists.txt
+++ b/intern/bsp/CMakeLists.txt
@@ -25,11 +25,11 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	./intern
+	intern
 	../container
 	../guardedalloc
-	../moto/include
 	../memutil
+	../moto/include
 )
 
 set(INC_SYS
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index d8edffbfe0b..fae8590568d 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -40,7 +40,7 @@
 #define FFMPEG_HAVE_AVIO 1
 #endif
 
-#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122))
+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 121))
 #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
 #endif
 
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 41c70b7cd16..ccd763ef42c 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -37,9 +37,8 @@ set(INC_SYS
 
 set(SRC
 	intern/GHOST_Buttons.cpp
-	intern/GHOST_CallbackEventConsumer.cpp
 	intern/GHOST_C-api.cpp
-	intern/GHOST_Path-api.cpp
+	intern/GHOST_CallbackEventConsumer.cpp
 	intern/GHOST_DisplayManager.cpp
 	intern/GHOST_EventManager.cpp
 	intern/GHOST_ISystem.cpp
@@ -47,6 +46,7 @@ set(SRC
 	intern/GHOST_ModifierKeys.cpp
 	intern/GHOST_NDOFManager.cpp
 	intern/GHOST_Path-api.cpp
+	intern/GHOST_Path-api.cpp
 	intern/GHOST_Rect.cpp
 	intern/GHOST_System.cpp
 	intern/GHOST_TimerManager.cpp
@@ -63,6 +63,7 @@ set(SRC
 	GHOST_Path-api.h
 	GHOST_Rect.h
 	GHOST_Types.h
+
 	intern/GHOST_Buttons.h
 	intern/GHOST_CallbackEventConsumer.h
 	intern/GHOST_Debug.h
@@ -146,7 +147,9 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 		)
 	endif()
 
-	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+	list(APPEND INC_SYS
+		${SDL_INCLUDE_DIR}
+	)
 
 elseif(APPLE)
 	if(WITH_COCOA)
@@ -185,7 +188,9 @@ elseif(UNIX)
 		add_definitions(-DWITH_X11_XINPUT)
 	endif()
 
-	list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC_SYS
+		${X11_X11_INCLUDE_PATH}
+	)
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerX11.cpp
@@ -205,7 +210,9 @@ elseif(UNIX)
 
 	if(X11_XF86keysym_INCLUDE_PATH)
 		add_definitions(-DWITH_XF86KEYSYM)
-		list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH})
+		list(APPEND INC_SYS
+			${X11_XF86keysym_INCLUDE_PATH}
+		)
 	endif()
 
 elseif(WIN32)
@@ -213,7 +220,9 @@ elseif(WIN32)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
 	endif()
 
-	list(APPEND INC_SYS ${WINTAB_INC})
+	list(APPEND INC_SYS
+		${WINTAB_INC}
+	)
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerWin32.cpp
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 3ebd24c008b..dd296fa979c 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -150,8 +150,9 @@ GHOST_SystemX11(
 	if (gettimeofday(&tv,NULL) == -1) {
 		GHOST_ASSERT(false,"Could not instantiate timer!");
 	}
-
-	m_start_time = GHOST_TUns64(tv.tv_sec*1000 + tv.tv_usec/1000);
+	
+	// Taking care not to overflow the tv.tv_sec*1000
+	m_start_time = GHOST_TUns64(tv.tv_sec)*1000 + tv.tv_usec/1000;
 	
 	
 	/* use detectable autorepeate, mac and windows also do this */
@@ -199,7 +200,8 @@ getMilliSeconds(
 		GHOST_ASSERT(false,"Could not compute time!");
 	}
 
-	return  GHOST_TUns64(tv.tv_sec*1000 + tv.tv_usec/1000) - m_start_time;
+	// Taking care not to overflow the tv.tv_sec*1000
+	return  GHOST_TUns64(tv.tv_sec)*1000 + tv.tv_usec/1000 - m_start_time;
 }
 	
 	GHOST_TUns8 
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index c05ada84773..1bb73553012 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -243,7 +243,7 @@ tbool genTangSpace(const SMikkTSpaceContext * pContext, const float fAngularThre
 	int iNrActiveGroups = 0, index = 0;
 	const int iNrFaces = pContext->m_pInterface->m_getNumFaces(pContext);
 	tbool bRes = TFALSE;
-	const float fThresCos = (const float) cos((fAngularThreshold*(float)M_PI)/180.0f);
+	const float fThresCos = (float) cos((fAngularThreshold*(float)M_PI)/180.0f);
 
 	// verify all call-backs have been set
 	if( pContext->m_pInterface->m_getNumFaces==NULL ||
@@ -1411,7 +1411,7 @@ STSpace EvalTspace(int face_indices[], const int iFaces, const int piTriListIn[]
 			// weight contribution by the angle
 			// between the two edge vectors
 			fCos = vdot(v1,v2); fCos=fCos>1?1:(fCos<(-1) ? (-1) : fCos);
-			fAngle = (const float) acos(fCos);
+			fAngle = (float) acos(fCos);
 			fMagS = pTriInfos[f].fMagS;
 			fMagT = pTriInfos[f].fMagT;
 
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 174ee8bc3ed..094d398a83c 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -89,7 +89,9 @@ endif()
 
 if(WITH_FFTW3)
 	add_definitions(-DFFTW3=1)
-	list(APPEND INC ${FFTW3_INCLUDE_DIRS})
+	list(APPEND INC
+		${FFTW3_INCLUDE_DIRS}
+	)
 endif()
 
 blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")