diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-26 05:49:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-26 06:02:09 +0300 |
| commit | 74938480083a908a5d1fad448f1214b214727bf3 (patch) | |
| tree | cbc5ddb594a7676e87a10fa9f2ddcbc6acef2316 /source/blender/editors/curve | |
| parent | b4e037fe14052619e23863ca08524c97181b3292 (diff) | |
3D View: remove 3D cursor
Use 3D cursor from the scene (was previously used for local-view).
Diffstat (limited to 'source/blender/editors/curve')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve_paint.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index b3650a67972..8a8046d5c38 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -4819,14 +4819,13 @@ static int spin_exec(bContext *C, wmOperator *op) static int spin_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) { Scene *scene = CTX_data_scene(C); - View3D *v3d = CTX_wm_view3d(C); RegionView3D *rv3d = ED_view3d_context_rv3d(C); float axis[3] = {0.0f, 0.0f, 1.0f}; if (rv3d) copy_v3_v3(axis, rv3d->viewinv[2]); - RNA_float_set_array(op->ptr, "center", ED_view3d_cursor3d_get(scene, v3d)->location); + RNA_float_set_array(op->ptr, "center", scene->cursor.location); RNA_float_set_array(op->ptr, "axis", axis); return spin_exec(C, op); @@ -5303,7 +5302,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, const wmEvent *event) mul_v3_m4v3(location, vc.obedit->obmat, bp->vec); } else { - copy_v3_v3(location, ED_view3d_cursor3d_get(vc.scene, vc.v3d)->location); + copy_v3_v3(location, vc.scene->cursor.location); } ED_view3d_win_to_3d_int(vc.v3d, vc.ar, location, event->mval, location); diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index f9d9c5a776f..3fe880865bb 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -1121,7 +1121,7 @@ static int curve_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event) /* use view plane (when set or as fallback when surface can't be found) */ if (cdd->project.use_depth == false) { - plane_co = ED_view3d_cursor3d_get(cdd->vc.scene, v3d)->location; + plane_co = cdd->vc.scene->cursor.location; plane_no = rv3d->viewinv[2]; cdd->project.use_plane = true; } |