diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 12:35:29 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 12:55:12 +0300 |
commit | c8597a465f22e020b1c0ce6fcfbb7b7308efdad1 (patch) | |
tree | bdff87671b2f24ce7f393534e4325fb9e66eeda8 /source/blender/editors/transform/transform_snap_object.c | |
parent | 754d3a2fe626fbe57bb6ef47581368e3859f6390 (diff) |
Object Mode: remove Scene.obedit
Add ED_screen_window_find, BKE_workspace_edit_object
Diffstat (limited to 'source/blender/editors/transform/transform_snap_object.c')
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 82da9991dda..14cd4bcc7ac 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -822,7 +822,7 @@ static bool raycastObjects( Object **r_ob, float r_obmat[4][4], ListBase *r_hit_list) { - Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL; + Object *obedit = use_object_edit_cage ? OBEDIT_FROM_EVAL_CTX(&sctx->eval_ctx) : NULL; struct RaycastObjUserData data = { .ray_start = ray_start, @@ -2060,7 +2060,7 @@ static bool snapObjectsRay( float r_loc[3], float r_no[3], Object **r_ob, float r_obmat[4][4]) { - Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL; + Object *obedit = use_object_edit_cage ? OBEDIT_FROM_EVAL_CTX(&sctx->eval_ctx) : NULL; struct SnapObjUserData data = { .snapdata = snapdata, |