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, 4 insertions, 4 deletions

diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h
index 6b0d74e7eb9..0aa93a2fad0 100644
--- a/intern/ghost/intern/GHOST_Buttons.h
+++ b/intern/ghost/intern/GHOST_Buttons.h
@@ -48,26 +48,26 @@ struct GHOST_Buttons {
 	 */
 	GHOST_Buttons();
 
-	virtual ~GHOST_Buttons();
+	~GHOST_Buttons();
 
 	/**
 	 * Returns the state of a single button.
 	 * \param mask Key button to return.
 	 * \return The state of the button (pressed == true).
 	 */
-	virtual bool get(GHOST_TButtonMask mask) const;
+	bool get(GHOST_TButtonMask mask) const;
 
 	/**
 	 * Updates the state of a single button.
 	 * \param mask Button state to update.
 	 * \param down The new state of the button.
 	 */
-	virtual void set(GHOST_TButtonMask mask, bool down);
+	void set(GHOST_TButtonMask mask, bool down);
 
 	/**
 	 * Sets the state of all buttons to up.
 	 */
-	virtual void clear();
+	void clear();
 
 	GHOST_TUns8 m_ButtonLeft        : 1;
 	GHOST_TUns8 m_ButtonMiddle      : 1;