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, 147 insertions, 0 deletions

diff --git a/source/gameengine/Expressions/intern/StringValue.cpp b/source/gameengine/Expressions/intern/StringValue.cpp
new file mode 100644
index 00000000000..ddf61dc441c
--- /dev/null
+++ b/source/gameengine/Expressions/intern/StringValue.cpp
@@ -0,0 +1,147 @@
+/** \file gameengine/Expressions/StringValue.cpp
+ *  \ingroup expressions
+ */
+// StringValue.cpp: implementation of the CStringValue class.
+/*
+ * Copyright (c) 1996-2000 Erwin Coumans <coockie@acm.org>
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Erwin Coumans makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+#include "EXP_StringValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_VoidValue.h"
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+/**
+ * pre: false
+ * effect: constructs a new CStringValue
+ */
+CStringValue::CStringValue()
+{
+	m_strString = "[Illegal String constructor call]";
+}
+
+/**
+ * pre:
+ * effect: constructs a new CStringValue containing text txt
+ */
+CStringValue::CStringValue(const char *txt,const char *name,AllocationTYPE alloctype)
+{
+	m_strString = txt;
+	SetName(name);
+	
+	if (alloctype==CValue::STACKVALUE)
+	{
+		CValue::DisableRefCount();
+		
+	}
+	
+	
+}
+
+
+/**
+ * pre:
+ * ret: a new object containing the result of applying operator op to this
+ * object and val
+ */
+CValue* CStringValue::Calc(VALUE_OPERATOR op, CValue *val)
+{
+	//return val->CalrcString(op, this);
+	return val->CalcFinal(VALUE_STRING_TYPE, op, this);
+}
+
+/**
+ * pre: the type of val is dtype
+ * ret: a new object containing the result of applying operator op to val and
+ * this object
+ */
+CValue* CStringValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val)
+{
+	CValue *ret;
+	
+	if (op == VALUE_ADD_OPERATOR) {
+		if (dtype == VALUE_ERROR_TYPE)
+			ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
+		else
+			ret = new CStringValue(val->GetText() + GetText(),"");
+	}
+	else {
+		if (dtype == VALUE_STRING_TYPE || dtype == VALUE_EMPTY_TYPE) {
+			switch (op) {
+				case VALUE_EQL_OPERATOR:
+					ret = new CBoolValue(val->GetText() == GetText());
+					break;
+				case VALUE_NEQ_OPERATOR:
+					ret = new CBoolValue(val->GetText() != GetText());
+					break;
+				case VALUE_GRE_OPERATOR:
+					ret = new CBoolValue(val->GetText() > GetText());
+					break;
+				case VALUE_LES_OPERATOR:
+					ret = new CBoolValue(val->GetText() < GetText());
+					break;
+				case VALUE_GEQ_OPERATOR:
+					ret = new CBoolValue(val->GetText() >= GetText());
+					break;
+				case VALUE_LEQ_OPERATOR:
+					ret = new CBoolValue(val->GetText() <= GetText());
+					break;
+				default:
+					ret =  new CErrorValue(val->GetText() + op2str(op) + "[operator not allowed on strings]");
+					break;
+			}
+		}
+		else {
+			ret =  new CErrorValue(val->GetText() + op2str(op) + "[operator not allowed on strings]");
+		}
+	}
+	return ret;
+}
+
+
+
+double CStringValue::GetNumber()
+{
+	return -1;
+}
+
+
+
+int CStringValue::GetValueType()
+{
+	return VALUE_STRING_TYPE;
+}
+
+
+
+const STR_String & CStringValue::GetText()
+{
+	return m_strString;
+}
+
+bool CStringValue::IsEqual(const STR_String & other)
+{
+	return (m_strString == other);
+}
+
+CValue* CStringValue::GetReplica()
+{ 
+	CStringValue* replica = new CStringValue(*this);
+	replica->ProcessReplica();
+	return replica;
+};
+
+