[Bf-blender-cvs] [e7c6245] soc-2014-viewport_context: setTitle should not be called until the window is valid note: X11 and WGL do not do as extensive assertions to check if window is valid, so this only caused a problem on OSX

[Jason Wilkins]

Commit: e7c62454899fadbf6063a78ddf7d6c488a288f9a
Author: Jason Wilkins
Date:   Thu Jul 24 02:10:59 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rBe7c62454899fadbf6063a78ddf7d6c488a288f9a

setTitle should not be called until the window is valid
note: X11 and WGL do not do as extensive assertions to check if window is valid, so this only caused a problem on OSX

===================================================================

M	intern/ghost/intern/GHOST_WindowCocoa.mm
M	intern/ghost/intern/GHOST_WindowX11.cpp
M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 33708e2..00af40f 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -583,8 +583,6 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
 	minSize.height = 240;
 	[m_window setContentMinSize:minSize];
 	
-	setTitle(title);
-	
 	//Creates the OpenGL View inside the window
 	m_openGLView = [[CocoaOpenGLView alloc] initWithFrame:rect];
 	
@@ -609,6 +607,8 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
 		}
 	}
 	
+	setTitle(title);
+	
 	m_tablet.Active = GHOST_kTabletModeNone;
 	
 	CocoaWindowDelegate *windowDelegate = [[CocoaWindowDelegate alloc] init];
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 8016495..47b5e13 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -366,8 +366,6 @@ GHOST_WindowX11(
 	                BLENDER_ICON_48x48x32[0] * BLENDER_ICON_48x48x32[1] + 2);
 	/* done setting the icon */
 
-	setTitle(title);
-
 #ifdef WITH_X11_XINPUT
 	initXInputDevices();
 
@@ -380,6 +378,8 @@ GHOST_WindowX11(
 		GHOST_PRINT("Created window\n");
 	}
 
+	setTitle(title);
+
 	if (exclusive) {
 		XMapRaised(m_display, m_window);
 	}
@@ -479,7 +479,7 @@ bool
 GHOST_WindowX11::
 getValid() const
 {
-	return m_valid_setup;
+	return GHOST_Window::getValid() && m_valid_setup;
 }
 
 void
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 5ea1456..919eb68 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 5ea1456cf5bf9caa32d4988284cc0b75637dd45d
+Subproject commit 919eb683bd2c5a2e626bcdb78f5fd5c048a70fdb
diff --git a/release/scripts/addons b/release/scripts/addons
index 59ff66f..74393fe 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 59ff66fa7aca6a56dfa516ee4a456428516d2c6f
+Subproject commit 74393fe915b5dadbe3066a149ef1d16575d5912e
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 9c1b725..88931a0 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 9c1b7252bb510cc527c4ef2fd5aa3b586d095e98
+Subproject commit 88931a09a925a86701779a4b700508eff9fdc6ba