Fix bad merge conflict resolution

Line got lost..
2018-04-18 16:12:56 +02:00 · 2018-04-18 16:12:56 +02:00 · 24b3b9fa21
parent 3b209a45de
commit 24b3b9fa21
1 changed files with 2 additions and 0 deletions
--- 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) {