diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-08 13:16:37 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-08 13:17:22 +0300 |
| commit | 7b6af843c2bdef9c9ab6d00100d93192a8e769c0 (patch) | |
| tree | 1dae0407c639733739a2e281547f54d8e8a93614 /source/blender/editors/transform/transform_snap.c | |
| parent | 55606dbdbcd33fb8ba2ee41284fc1c5c35977815 (diff) | |
Cleanup: getting rid of G.main.
Sometimes one needs a *lot* of changes for a single G.main... :/
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 295f27d830f..5ea826521ed 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -284,6 +284,8 @@ eRedrawFlag handleSnapping(TransInfo *t, const wmEvent *event) void applyProject(TransInfo *t) { + Main *bmain = CTX_data_main(t->context); + /* XXX FLICKER IN OBJECT MODE */ if ((t->tsnap.project) && activeSnap(t) && (t->flag & T_NO_PROJECT) == 0) { TransData *td = t->data; @@ -316,7 +318,7 @@ void applyProject(TransInfo *t) mul_m4_v3(ob->obmat, iloc); } else if (t->flag & T_OBJECT) { - BKE_object_eval_transform_all(G.main->eval_ctx, t->scene, td->ob); + BKE_object_eval_transform_all(bmain->eval_ctx, t->scene, td->ob); copy_v3_v3(iloc, td->ob->obmat[3]); } @@ -359,6 +361,8 @@ void applyProject(TransInfo *t) void applyGridAbsolute(TransInfo *t) { + Main *bmain = CTX_data_main(t->context); + float grid_size = 0.0f; GearsType grid_action; TransData *td; @@ -405,7 +409,7 @@ void applyGridAbsolute(TransInfo *t) mul_m4_v3(obmat, iloc); } else if (t->flag & T_OBJECT) { - BKE_object_eval_transform_all(G.main->eval_ctx, t->scene, td->ob); + BKE_object_eval_transform_all(bmain->eval_ctx, t->scene, td->ob); copy_v3_v3(iloc, td->ob->obmat[3]); } @@ -514,6 +518,7 @@ static bool bm_face_is_snap_target(BMFace *f, void *UNUSED(user_data)) static void initSnappingMode(TransInfo *t) { + Main *bmain = CTX_data_main(t->context); ToolSettings *ts = t->settings; Object *obedit = t->obedit; Scene *scene = t->scene; @@ -598,7 +603,7 @@ static void initSnappingMode(TransInfo *t) if (t->spacetype == SPACE_VIEW3D) { if (t->tsnap.object_context == NULL) { t->tsnap.object_context = ED_transform_snap_object_context_create_view3d( - G.main, t->scene, 0, + bmain, t->scene, 0, t->ar, t->view); ED_transform_snap_object_context_set_editmesh_callbacks( |