[Bf-blender-cvs] [1f0d63b9a1e] master: Cleanup: remove unnecessary obedit argument from ED_space_image_set
Campbell Barton
noreply at git.blender.org
Tue Aug 31 10:30:52 CEST 2021
Commit: 1f0d63b9a1e3d11885a8acf8e55b36e3f7fb737b
Author: Campbell Barton
Date: Tue Aug 31 18:25:43 2021 +1000
Branches: master
https://developer.blender.org/rB1f0d63b9a1e3d11885a8acf8e55b36e3f7fb737b
Cleanup: remove unnecessary obedit argument from ED_space_image_set
This was left over from when changing the image set the faces texture.
===================================================================
M source/blender/editors/include/ED_image.h
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/space_image/image_edit.c
M source/blender/editors/space_image/image_ops.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index ec525806b81..6b0b9f4a27c 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -46,7 +46,6 @@ struct wmWindowManager;
struct Image *ED_space_image(struct SpaceImage *sima);
void ED_space_image_set(struct Main *bmain,
struct SpaceImage *sima,
- struct Object *obedit,
struct Image *ima,
bool automatic);
void ED_space_image_auto_set(const struct bContext *C, struct SpaceImage *sima);
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 39d776e0054..b5113681955 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -1153,7 +1153,7 @@ void ED_object_texture_paint_mode_enter_ex(Main *bmain, Scene *scene, Object *ob
SpaceImage *sima = (SpaceImage *)sl;
if (!sima->pin) {
- ED_space_image_set(bmain, sima, NULL, ima, true);
+ ED_space_image_set(bmain, sima, ima, true);
}
}
}
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index a95189a303f..2174a4b9dc1 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -57,7 +57,7 @@ Image *ED_space_image(SpaceImage *sima)
return sima->image;
}
-void ED_space_image_set(Main *bmain, SpaceImage *sima, Object *obedit, Image *ima, bool automatic)
+void ED_space_image_set(Main *bmain, SpaceImage *sima, Image *ima, bool automatic)
{
/* Automatically pin image when manually assigned, otherwise it follows object. */
if (!automatic && sima->image != ima && sima->mode == SI_MODE_UV) {
@@ -78,10 +78,6 @@ void ED_space_image_set(Main *bmain, SpaceImage *sima, Object *obedit, Image *im
id_us_ensure_real((ID *)sima->image);
- if (obedit) {
- WM_main_add_notifier(NC_GEOM | ND_DATA, obedit->data);
- }
-
WM_main_add_notifier(NC_SPACE | ND_SPACE_IMAGE, NULL);
}
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 11efd3e33ef..94d44e047a4 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1311,7 +1311,6 @@ static int image_open_exec(bContext *C, wmOperator *op)
Main *bmain = CTX_data_main(C);
ScrArea *area = CTX_wm_area(C);
Scene *scene = CTX_data_scene(C);
- Object *obedit = CTX_data_edit_object(C);
ImageUser *iuser = NULL;
Image *ima = NULL;
int frame_seq_len = 0;
@@ -1364,7 +1363,7 @@ static int image_open_exec(bContext *C, wmOperator *op)
}
else if (area && area->spacetype == SPACE_IMAGE) {
SpaceImage *sima = area->spacedata.first;
- ED_space_image_set(bmain, sima, obedit, ima, false);
+ ED_space_image_set(bmain, sima, ima, false);
iuser = &sima->iuser;
}
else {
@@ -2519,7 +2518,6 @@ static void image_new_free(wmOperator *op)
static int image_new_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima;
- Object *obedit;
Image *ima;
Main *bmain;
PropertyRNA *prop;
@@ -2531,7 +2529,6 @@ static int image_new_exec(bContext *C, wmOperator *op)
/* retrieve state */
sima = CTX_wm_space_image(C);
- obedit = CTX_data_edit_object(C);
bmain = CTX_data_main(C);
prop = RNA_struct_find_property(op->ptr, "name");
@@ -2587,7 +2584,7 @@ static int image_new_exec(bContext *C, wmOperator *op)
RNA_property_update(C, &data->pprop.ptr, data->pprop.prop);
}
else if (sima) {
- ED_space_image_set(bmain, sima, obedit, ima, false);
+ ED_space_image_set(bmain, sima, ima, false);
}
BKE_image_signal(bmain, ima, (sima) ? &sima->iuser : NULL, IMA_SIGNAL_USER_NEW_IMAGE);
@@ -3705,7 +3702,7 @@ static int image_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op))
ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
if (sima->image == NULL) {
- ED_space_image_set(bmain, sima, NULL, ima, false);
+ ED_space_image_set(bmain, sima, ima, false);
}
RE_ReadRenderResult(scene, scene);
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,
More information about the Bf-blender-cvs
mailing list