diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 16:33:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 16:33:17 +0400 |
| commit | 64ab4140268498384525e05596ea1f559b7cd3df (patch) | |
| tree | c27a3774eb433e0cccd5d3284e6b79f96e32306d /source/blender/editors/space_image | |
| parent | dca15b215d994c7bafe9398493a9db1b4df00246 (diff) | |
| parent | db75cc4cdebb536774a8f2d7601319e2c898ecb0 (diff) | |
Cycles: svn merge -r41627:41650 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index e817565c509..c29553a9c87 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -84,7 +84,7 @@ Image *ED_space_image(SpaceImage *sima) /* called to assign images to UV faces */ void ED_space_image_set(bContext *C, SpaceImage *sima, Scene *scene, Object *obedit, Image *ima) { - ED_uvedit_assign_image(G.main, scene, obedit, ima, sima->image); + ED_uvedit_assign_image(CTX_data_main(C), scene, obedit, ima, sima->image); /* change the space ima after because uvedit_face_visible uses the space ima * to check if the face is displayed in UV-localview */ |