diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-18 17:12:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-18 17:12:56 +0300 |
| commit | 24b3b9fa215b52fc38a3238e7216f8cadce0620e (patch) | |
| tree | 8b38acc50fa9e6474b2fc1f9d9f384c151feb297 /source/blender/editors | |
| parent | 3b209a45de420a4e4e98ab71c6e1c521612171fa (diff) | |
Fix bad merge conflict resolution
Line got lost..
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |