MESH_OT_vert_connect was missing select flush (newly created edges were not selected).

also <120 line length for cycles property descriptions.

2 files changed, 26 insertions, 11 deletions

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index f83a3996167..5c68b7f2cb4 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -136,7 +136,8 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
                 )
         cls.blur_glossy = FloatProperty(
                 name="Filter Glossy",
-                description="Adaptively blur glossy shaders after blurry bounces, to reduce noise at the cost of accuracy",
+                description="Adaptively blur glossy shaders after blurry bounces, "
+                            "to reduce noise at the cost of accuracy",
                 min=0.0, max=10.0,
                 default=0.0,
                 )
@@ -230,7 +231,9 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
         cls.sample_clamp = FloatProperty(
                 name="Clamp",
-                description="If non-zero, the maximum value for a sample, higher values will be scaled down to avoid too much noise and slow convergence at the cost of accuracy",
+                description="If non-zero, the maximum value for a sample, "
+                            "higher values will be scaled down to avoid too "
+                            "much noise and slow convergence at the cost of accuracy",
                 min=0.0, max=1e8,
                 default=0.0,
                 )
@@ -244,7 +247,8 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
         cls.preview_start_resolution = IntProperty(
                 name="Start Resolution",
-                description="Resolution to start rendering preview at, progressively increasing it to the full viewport size",
+                description="Resolution to start rendering preview at, "
+                            "progressively increasing it to the full viewport size",
                 min=8, max=16384,
                 default=64,
                 )
@@ -286,7 +290,10 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
                 )
         cls.use_progressive_refine = BoolProperty(
                 name="Progressive Refine",
-                description="Instead of rendering each tile until it is finished, refine the whole image progressively. This renders somewhat slower, but time can be saved by manually stopping the render when the noise is low enough.",
+                description="Instead of rendering each tile until it is finished, "
+                            "refine the whole image progressively. "
+                            "This renders somewhat slower, "
+                            "but time can be saved by manually stopping the render when the noise is low enough",
                 default=False,
                 )
 
@@ -374,12 +381,15 @@ class CyclesMaterialSettings(bpy.types.PropertyGroup):
                 )
         cls.sample_as_light = BoolProperty(
                 name="Sample as Lamp",
-                description="Use direct light sampling for this material, disabling may reduce overall noise for large objects that emit little light compared to other light sources",
+                description="Use direct light sampling for this material, "
+                            "disabling may reduce overall noise for large "
+                            "objects that emit little light compared to other light sources",
                 default=True,
                 )
         cls.homogeneous_volume = BoolProperty(
                 name="Homogeneous Volume",
-                description="When using volume rendering, assume volume has the same density everywhere, for faster rendering",
+                description="When using volume rendering, assume volume has the same density everywhere, "
+                            "for faster rendering",
                 default=False,
                 )
 
@@ -423,12 +433,14 @@ class CyclesWorldSettings(bpy.types.PropertyGroup):
                 )
         cls.sample_as_light = BoolProperty(
                 name="Sample as Lamp",
-                description="Use direct light sampling for the environment, enabling for non-solid colors is recommended",
+                description="Use direct light sampling for the environment, "
+                            "enabling for non-solid colors is recommended",
                 default=False,
                 )
         cls.sample_map_resolution = IntProperty(
                 name="Map Resolution",
-                description="Importance map size is resolution x resolution; higher values potentially produce less noise, at the cost of memory and speed",
+                description="Importance map size is resolution x resolution; "
+                            "higher values potentially produce less noise, at the cost of memory and speed",
                 min=4, max=8096,
                 default=256,
                 )
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index d8dce98a009..1507597feeb 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -1218,10 +1218,13 @@ static int edbm_vert_connect(bContext *C, wmOperator *op)
 	if (!EDBM_op_finish(em, &bmop, op, TRUE)) {
 		return OPERATOR_CANCELLED;
 	}
-	
-	EDBM_update_generic(C, em, TRUE);
+	else {
+		EDBM_selectmode_flush(em);  /* so newly created edges get the selection state from the vertex */
 
-	return len ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
+		EDBM_update_generic(C, em, TRUE);
+
+		return len ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
+	}
 }
 
 void MESH_OT_vert_connect(wmOperatorType *ot)