[Bf-blender-cvs] [24b3b9fa215] blender2.8: Fix bad merge conflict resolution

[Sergey Sharybin]

Commit: 24b3b9fa215b52fc38a3238e7216f8cadce0620e
Author: Sergey Sharybin
Date:   Wed Apr 18 16:12:56 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB24b3b9fa215b52fc38a3238e7216f8cadce0620e

Fix bad merge conflict resolution

Line got lost..

===================================================================

M	source/blender/editors/space_view3d/view3d_edit.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index d78d3f96835..858a4a1dfb6 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -2824,6 +2824,8 @@ static int viewselected_exec(bContext *C, wmOperator *op)
 						break;
 			}
 		}
+		if (base)
+			ob = base->object;
 	}
 
 	if (is_gp_edit) {