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/editors/space_image
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/editors/space_image')
-rw-r--r--source/blender/editors/space_image/image_edit.c6
-rw-r--r--source/blender/editors/space_image/image_ops.c9
2 files changed, 4 insertions, 11 deletions
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);