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, 2 deletions

diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
index 653fd0b1d29..9f85e84e297 100644
--- a/source/blender/freestyle/intern/python/Director.cpp
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -265,8 +265,9 @@ int Director_BPy_UnaryFunction0D___call__(void *uf0D, void *py_uf0D, Interface0D
 	}
 	else if (BPy_UnaryFunction0DVectorViewShape_Check(obj)) {
 		vector<ViewShape*> vec;
+		vec.reserve(PyList_Size(result));
 		for (int i = 0; i < PyList_Size(result); i++) {
-			ViewShape *b = ((BPy_ViewShape *)PyList_GetItem(result, i))->vs;
+			ViewShape *b = ((BPy_ViewShape *)PyList_GET_ITEM(result, i))->vs;
 			vec.push_back(b);
 		}
 		((UnaryFunction0D< vector<ViewShape*> > *)uf0D)->result = vec;
@@ -318,8 +319,9 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, void *py_uf1D, Interface1D
 	}
 	else if (BPy_UnaryFunction1DVectorViewShape_Check(obj)) {
 		vector<ViewShape*> vec;
+		vec.reserve(PyList_Size(result));
 		for (int i = 1; i < PyList_Size(result); i++) {
-			ViewShape *b = ((BPy_ViewShape *)PyList_GetItem(result, i))->vs;
+			ViewShape *b = ((BPy_ViewShape *)PyList_GET_ITEM(result, i))->vs;
 			vec.push_back(b);
 		}
 		((UnaryFunction1D< vector<ViewShape*> > *)uf1D)->result = vec;