diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 19:23:20 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 19:23:20 +0300 |
| commit | cfea9c261c2349e03c5ce38a04659479901ce815 (patch) | |
| tree | 69a9e23450ee3d2d89eddf0dc70208f6ec3c3281 /source/blender/editors/space_image/image_edit.c | |
| parent | da11e33b26b6579ef36c97de1b6fbc0eb02a0b69 (diff) | |
Cleanup: Remove G.main from some editor files.
Diffstat (limited to 'source/blender/editors/space_image/image_edit.c')
| -rw-r--r-- | source/blender/editors/space_image/image_edit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 9d7944a25d3..383303c9ad0 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -41,6 +41,7 @@ #include "BKE_image.h" #include "BKE_editmesh.h" #include "BKE_library.h" +#include "BKE_main.h" #include "IMB_imbuf_types.h" @@ -61,10 +62,10 @@ Image *ED_space_image(SpaceImage *sima) } /* called to assign images to UV faces */ -void ED_space_image_set(SpaceImage *sima, Scene *scene, Object *obedit, Image *ima) +void ED_space_image_set(Main *bmain, SpaceImage *sima, Scene *scene, Object *obedit, Image *ima) { /* context may be NULL, so use global */ - ED_uvedit_assign_image(G.main, scene, obedit, ima, sima->image); + ED_uvedit_assign_image(bmain, scene, obedit, ima, sima->image); /* change the space ima after because uvedit_face_visible_test uses the space ima * to check if the face is displayed in UV-localview */ |