Merged changes in the trunk up to revision 53146.

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c

5 files changed, 38 insertions, 6 deletions

diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 6f348ccc267..25b55eacd77 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -37,6 +37,7 @@ struct ColorManagedDisplay;
 
 int BLF_init(int points, int dpi);
 void BLF_exit(void);
+void BLF_default_dpi(int dpi);
 
 void BLF_cache_clear(void);
 
diff --git a/source/blender/blenfont/BLF_translation.h b/source/blender/blenfont/BLF_translation.h
index 8eb40384044..eb3518ac997 100644
--- a/source/blender/blenfont/BLF_translation.h
+++ b/source/blender/blenfont/BLF_translation.h
@@ -85,8 +85,8 @@ const char *BLF_translate_do_tooltip(const char *msgctxt, const char *msgid);
 /*	#define _(msgid) msgid */
 	#define IFACE_(msgid) msgid
 	#define TIP_(msgid) msgid
-	#define CTX_IFACE_(context, msgid) ((void)context, msgid)
-	#define CTX_TIP_(context, msgid)   ((void)context, msgid)
+	#define CTX_IFACE_(context, msgid) msgid
+	#define CTX_TIP_(context, msgid)   msgid
 #endif
 
 /* Helper macro, when we want to define a same msgid for multiple msgctxt...
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript
index c0591c877ef..a6ea724a51f 100644
--- a/source/blender/blenfont/SConscript
+++ b/source/blender/blenfont/SConscript
@@ -1,4 +1,30 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Nathan Letwory.
+#
+# ***** END GPL LICENSE BLOCK *****
+
 import sys
 Import ('env')
 
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 778b6c11e5a..16756769675 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -87,6 +87,11 @@ int BLF_init(int points, int dpi)
 	return blf_font_init();
 }
 
+void BLF_default_dpi(int dpi)
+{
+	global_font_dpi = dpi;
+}
+
 void BLF_exit(void)
 {
 	FontBLF *font;
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
index 0ed48623dd5..4d066ea8740 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
@@ -30,6 +30,8 @@
 
 #include "BLF_translation.h" /* own include */
 
+#include "BLI_utildefines.h"
+
 #ifdef WITH_INTERNATIONAL
 
 #include <stdio.h>
@@ -50,7 +52,6 @@
 #include "BLI_linklist.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 /* Locale options. */
 static const char **locales = NULL;
@@ -254,9 +255,8 @@ void BLF_lang_free(void)
 	return;
 }
 
-void BLF_lang_set(const char *str)
+void BLF_lang_set(const char *UNUSED(str))
 {
-	(void)str;
 	return;
 }