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

diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c
index 213a0830e63..d5afb39d7b7 100644
--- a/source/blender/bmesh/operators/bmo_bevel.c
+++ b/source/blender/bmesh/operators/bmo_bevel.c
@@ -35,12 +35,14 @@
 
 void bmo_bevel_exec(BMesh *bm, BMOperator *op)
 {
-	const float offset      = BMO_slot_float_get(op->slots_in, "offset");
-	const int   offset_type = BMO_slot_int_get(op->slots_in,   "offset_type");
-	const int   seg         = BMO_slot_int_get(op->slots_in,   "segments");
-	const bool  vonly       = BMO_slot_bool_get(op->slots_in,  "vertex_only");
-	const float profile     = BMO_slot_float_get(op->slots_in, "profile");
-	const int   material    = BMO_slot_int_get(op->slots_in,   "material");
+	const float offset        = BMO_slot_float_get(op->slots_in, "offset");
+	const int   offset_type   = BMO_slot_int_get(op->slots_in,   "offset_type");
+	const int   seg           = BMO_slot_int_get(op->slots_in,   "segments");
+	const bool  vonly         = BMO_slot_bool_get(op->slots_in,  "vertex_only");
+	const float profile       = BMO_slot_float_get(op->slots_in, "profile");
+	const bool  clamp_overlap = BMO_slot_bool_get(op->slots_in,  "clamp_overlap");
+	const int   material      = BMO_slot_int_get(op->slots_in,   "material");
+	const bool  loop_slide    = BMO_slot_bool_get(op->slots_in,  "loop_slide");
 
 	if (offset > 0) {
 		BMOIter siter;
@@ -61,7 +63,7 @@ void bmo_bevel_exec(BMesh *bm, BMOperator *op)
 			}
 		}
 
-		BM_mesh_bevel(bm, offset, offset_type, seg, profile, vonly, false, false, NULL, -1, material);
+		BM_mesh_bevel(bm, offset, offset_type, seg, profile, vonly, false, clamp_overlap, NULL, -1, material, loop_slide);
 
 		BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "faces.out", BM_FACE, BM_ELEM_TAG);
 	}