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

diff --git a/source/blender/blenkernel/intern/sketch.c b/source/blender/blenkernel/intern/sketch.c
index da5dd76681d..0d355abb49b 100644
--- a/source/blender/blenkernel/intern/sketch.c
+++ b/source/blender/blenkernel/intern/sketch.c
@@ -81,6 +81,10 @@ void sk_initPoint(SK_Point *pt, SK_DrawData *dd, const float no[3])
 	}
 	pt->p2d[0] = dd->mval[0];
 	pt->p2d[1] = dd->mval[1];
+
+	pt->size = 0.0f;
+	pt->type = PT_CONTINUOUS;
+	pt->mode = PT_SNAP;
 	/* more init code here */
 }
 
@@ -192,14 +196,14 @@ void sk_appendStrokePoint(SK_Stroke *stk, SK_Point *pt)
 
 void sk_insertStrokePoints(SK_Stroke *stk, SK_Point *pts, int len, int start, int end)
 {
-	int size = end - start + 1;
+	int size = end - start;
 
 	sk_growStrokeBufferN(stk, len - size);
 
 	if (len != size) {
-		int tail_size = stk->nb_points - end + 1;
+		int tail_size = stk->nb_points - end;
 
-		memmove(stk->points + start + len, stk->points + end + 1, tail_size * sizeof(SK_Point));
+		memmove(stk->points + start + len, stk->points + end, tail_size * sizeof(SK_Point));
 	}
 
 	memcpy(stk->points + start, pts, len * sizeof(SK_Point));