diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
| commit | a6721c60d9bc0897e3ce0dc87264fbc705284397 (patch) | |
| tree | 12dd77160bcfaa4b37e85a5e8ed29496bb6c0705 /source/blender/editors/transform/transform_constraints.c | |
| parent | 16ca4b572e07aa0f83158c187a7c64b27675d4c9 (diff) | |
2.5
From the anti-globalization department:
G.obedit terminated!
Wherever possible, use CTX_data_edit_object(C) to get this
now. It's stored in scene now, and the screen context has
it defined.
Diffstat (limited to 'source/blender/editors/transform/transform_constraints.c')
| -rw-r--r-- | source/blender/editors/transform/transform_constraints.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 94c4ffa1497..cdde416ef9a 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -489,7 +489,7 @@ void setConstraint(TransInfo *t, float space[3][3], int mode, const char text[]) void setLocalConstraint(TransInfo *t, int mode, const char text[]) { if (t->flag & T_EDIT) { float obmat[3][3]; - Mat3CpyMat4(obmat, G.obedit->obmat); + Mat3CpyMat4(obmat, t->scene->obedit->obmat); setConstraint(t, obmat, mode|CON_LOCAL, text); } else { @@ -748,8 +748,8 @@ void BIF_drawPropCircle() BIF_ThemeColor(TH_GRID); /* if editmode we need to go into object space */ - if(G.obedit && t->spacetype == SPACE_VIEW3D) - mymultmatrix(G.obedit->obmat); + if(t->scene->obedit && t->spacetype == SPACE_VIEW3D) + mymultmatrix(t->scene->obedit->obmat); mygetmatrix(tmat); Mat4Invert(imat, tmat); @@ -759,7 +759,7 @@ void BIF_drawPropCircle() set_inverted_drawing(0); /* if editmode we restore */ - if(G.obedit && t->spacetype == SPACE_VIEW3D) + if(t->scene->obedit && t->spacetype == SPACE_VIEW3D) myloadmatrix(G.vd->viewmat); #endif } |