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/makesrna | |
| parent | da11e33b26b6579ef36c97de1b6fbc0eb02a0b69 (diff) | |
Cleanup: Remove G.main from some editor files.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 1959a017e43..4e86e5c59af 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -207,7 +207,7 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *s SpaceImage *sima = (SpaceImage *)sl; if (!sima->pin) - ED_space_image_set(sima, scene, scene->obedit, image); + ED_space_image_set(bmain, sima, scene, scene->obedit, image); } } } diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 6dbfc3634b2..140349ac003 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -388,7 +388,7 @@ static void rna_ImaPaint_canvas_update(Main *bmain, Scene *scene, PointerRNA *UN SpaceImage *sima = (SpaceImage *)sl; if (!sima->pin) - ED_space_image_set(sima, scene, scene->obedit, ima); + ED_space_image_set(bmain, sima, scene, scene->obedit, ima); } } } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d6a304f4dfe..6d77f3a9158 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -264,6 +264,7 @@ const EnumPropertyItem rna_enum_file_sort_items[] = { #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_depsgraph.h" +#include "BKE_global.h" #include "BKE_nla.h" #include "BKE_paint.h" #include "BKE_scene.h" @@ -835,7 +836,7 @@ static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value) SpaceImage *sima = (SpaceImage *)(ptr->data); bScreen *sc = (bScreen *)ptr->id.data; - ED_space_image_set(sima, sc->scene, sc->scene->obedit, (Image *)value.data); + ED_space_image_set(G.main, sima, sc->scene, sc->scene->obedit, (Image *)value.data); } static void rna_SpaceImageEditor_mask_set(PointerRNA *ptr, PointerRNA value) |