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

diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h
index 4d8c20065b5..7319bb537dd 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.h
+++ b/source/gameengine/GameLogic/SCA_LogicManager.h
@@ -24,7 +24,7 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-/** \file SCA_IController.h
+/** \file SCA_LogicManager.h
  *  \ingroup gamelogic
  *  \brief Regulates the top-level logic behavior for one scene.
  */
@@ -43,10 +43,10 @@
 
 #include "CTR_Map.h"
 #include "STR_HashedString.h"
-#include "Value.h"
+#include "EXP_Value.h"
 #include "SG_QList.h"
 
-#include "KX_HashedPtr.h"
+#include "EXP_HashedPtr.h"
 
 using namespace std;
 typedef std::list<class SCA_IController*> controllerlist;