Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes

Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];

The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42

Conflicts:
	intern/cycles/SConscript
	intern/cycles/blender/addon/__init__.py
	intern/cycles/blender/addon/properties.py
	intern/cycles/blender/blender_camera.cpp
	intern/cycles/kernel/kernel_types.h
	intern/cycles/kernel/svm/svm.h
	intern/cycles/kernel/svm/svm_types.h
	intern/cycles/render/camera.cpp
	intern/cycles/render/camera.h

1 files changed, 15 insertions, 3 deletions

diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp b/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
index 35c7c62a67d..09eb1691dae 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
@@ -113,12 +113,24 @@ void GPG_Canvas::SetSwapInterval(int interval)
 		m_window->setSwapInterval(interval);
 }
 
-int GPG_Canvas::GetSwapInterval()
+bool GPG_Canvas::GetSwapInterval(int& intervalOut)
 {
 	if (m_window)
-		return m_window->getSwapInterval();
+		return (bool)m_window->getSwapInterval(intervalOut);
 
-	return 0;
+	return false;
+}
+
+void GPG_Canvas::GetDisplayDimensions(int &width, int &height)
+ {
+	unsigned int uiwidth;
+	unsigned int uiheight;
+
+	GHOST_ISystem *system = GHOST_ISystem::getSystem();
+	system->getMainDisplayDimensions(uiwidth, uiheight);
+
+	width = uiwidth;
+	height = uiheight;
 }
 
 void GPG_Canvas::ResizeWindow(int width, int height)