Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-08-31 11:25:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-08-31 11:29:09 +0300
commit1f0d63b9a1e3d11885a8acf8e55b36e3f7fb737b (patch)
tree71994a8e443feca471aceb56c12dce53ee0cf114 /source/blender/makesrna
parent8e00db42961297facd521139762fe8c42042fc5c (diff)
Cleanup: remove unnecessary obedit argument from ED_space_image_set
This was left over from when changing the image set the faces texture.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_material.c8
-rw-r--r--source/blender/makesrna/intern/rna_sculpt_paint.c3
-rw-r--r--source/blender/makesrna/intern/rna_space.c9
3 files changed, 3 insertions, 17 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 144950235c8..8d0d3adab8b 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -173,12 +173,6 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain,
continue;
}
- Object *obedit = NULL;
- {
- ViewLayer *view_layer = WM_window_get_active_view_layer(win);
- obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
- }
-
ScrArea *area;
for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
@@ -186,7 +180,7 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain,
if (sl->spacetype == SPACE_IMAGE) {
SpaceImage *sima = (SpaceImage *)sl;
if (!sima->pin) {
- ED_space_image_set(bmain, sima, obedit, image, true);
+ ED_space_image_set(bmain, sima, image, true);
}
}
}
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 81acedb76f2..1da08448c5b 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -507,7 +507,6 @@ static void rna_ImaPaint_canvas_update(bContext *C, PointerRNA *UNUSED(ptr))
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
Object *ob = OBACT(view_layer);
- Object *obedit = OBEDIT_FROM_OBACT(ob);
bScreen *screen;
Image *ima = scene->toolsettings->imapaint.canvas;
@@ -520,7 +519,7 @@ static void rna_ImaPaint_canvas_update(bContext *C, PointerRNA *UNUSED(ptr))
SpaceImage *sima = (SpaceImage *)slink;
if (!sima->pin) {
- ED_space_image_set(bmain, sima, obedit, ima, true);
+ ED_space_image_set(bmain, sima, ima, true);
}
}
}
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 5ab13e7b44e..886d38356cc 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1622,14 +1622,7 @@ static void rna_SpaceImageEditor_image_set(PointerRNA *ptr,
{
BLI_assert(BKE_id_is_in_global_main(value.data));
SpaceImage *sima = ptr->data;
- bScreen *screen = (bScreen *)ptr->owner_id;
- Object *obedit = NULL;
- wmWindow *win = ED_screen_window_find(screen, G_MAIN->wm.first);
- if (win != NULL) {
- ViewLayer *view_layer = WM_window_get_active_view_layer(win);
- obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
- }
- ED_space_image_set(G_MAIN, sima, obedit, (Image *)value.data, false);
+ ED_space_image_set(G_MAIN, sima, (Image *)value.data, false);
}
static void rna_SpaceImageEditor_mask_set(PointerRNA *ptr,