blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Cleanup: remove unused parameter.

This commit is contained in:
Brecht Van Lommel 2019-03-07 12:35:37 +01:00
parent 99ac2dea35
commit 8ca43a0c7b
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_image.h
View File

@ -37,7 +37,7 @@ struct wmWindowManager;
/* image_edit.c, exported for transform */
struct Image *ED_space_image(struct SpaceImage *sima);
void ED_space_image_set(struct Main *bmain, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima);
void ED_space_image_set(struct Main *bmain, struct SpaceImage *sima, struct Object *obedit, struct Image *ima);
struct Mask *ED_space_image_get_mask(struct SpaceImage *sima);
void ED_space_image_set_mask(struct bContext *C, struct SpaceImage *sima, struct Mask *mask);

2
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -1122,7 +1122,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
if (!sima->pin) {
Object *obedit = CTX_data_edit_object(C);
ED_space_image_set(bmain, sima, scene, obedit, ima);
ED_space_image_set(bmain, sima, obedit, ima);
}
}
}

2
source/blender/editors/space_image/image_edit.c
View File

@ -58,7 +58,7 @@ Image *ED_space_image(SpaceImage *sima)
}
/* called to assign images to UV faces */
void ED_space_image_set(Main *bmain, SpaceImage *sima, Scene *UNUSED(scene), Object *obedit, Image *ima)
void ED_space_image_set(Main *bmain, SpaceImage *sima, Object *obedit, Image *ima)
{
/* change the space ima after because uvedit_face_visible_test uses the space ima
* to check if the face is displayed in UV-localview */

8
source/blender/editors/space_image/image_ops.c
View File

@ -1300,7 +1300,7 @@ static int image_open_exec(bContext *C, wmOperator *op)
}
else if (sa && sa->spacetype == SPACE_IMAGE) {
SpaceImage *sima = sa->spacedata.first;
ED_space_image_set(bmain, sima, scene, obedit, ima);
ED_space_image_set(bmain, sima, obedit, ima);
iuser = &sima->iuser;
}
else {
@ -2405,7 +2405,6 @@ static void image_new_free(wmOperator *op)
static int image_new_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima;
Scene *scene;
Object *obedit;
Image *ima;
Main *bmain;
@ -2418,7 +2417,6 @@ static int image_new_exec(bContext *C, wmOperator *op)
/* retrieve state */
sima = CTX_wm_space_image(C);
scene = CTX_data_scene(C);
obedit = CTX_data_edit_object(C);
bmain = CTX_data_main(C);
@ -2463,7 +2461,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, scene, obedit, ima);
ED_space_image_set(bmain, sima, obedit, ima);
}
BKE_image_signal(bmain, ima, (sima) ? &sima->iuser : NULL, IMA_SIGNAL_USER_NEW_IMAGE);
@ -3802,7 +3800,7 @@ static int image_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op))
ima = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
if (sima->image == NULL) {
ED_space_image_set(bmain, sima, scene, NULL, ima);
ED_space_image_set(bmain, sima, NULL, ima);
}
RE_ReadRenderResult(scene, scene);

4
source/blender/makesrna/intern/rna_material.c
View File

@ -136,7 +136,7 @@ static void rna_Material_texpaint_begin(CollectionPropertyIterator *iter, Pointe
}
static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *scene, PointerRNA *ptr)
static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
bScreen *sc;
Material *ma = ptr->id.data;
@ -176,7 +176,7 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *s
if (sl->spacetype == SPACE_IMAGE) {
SpaceImage *sima = (SpaceImage *)sl;
if (!sima->pin) {
ED_space_image_set(bmain, sima, scene, obedit, image);
ED_space_image_set(bmain, sima, obedit, image);
}
}
}

2
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@ -490,7 +490,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, scene, obedit, ima);
ED_space_image_set(bmain, sima, obedit, ima);
}
}
}

5
source/blender/makesrna/intern/rna_space.c
View File

@ -1031,13 +1031,12 @@ static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value)
{
SpaceImage *sima = (SpaceImage *)(ptr->data);
bScreen *sc = (bScreen *)ptr->id.data;
wmWindow *win;
Scene *scene = ED_screen_scene_find_with_window(sc, G_MAIN->wm.first, &win);
wmWindow *win = ED_screen_window_find(sc, G_MAIN->wm.first);
ViewLayer *view_layer = WM_window_get_active_view_layer(win);
Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
BLI_assert(BKE_id_is_in_global_main(value.data));
ED_space_image_set(G_MAIN, sima, scene, obedit, (Image *)value.data);
ED_space_image_set(G_MAIN, sima, obedit, (Image *)value.data);
}
static void rna_SpaceImageEditor_mask_set(PointerRNA *ptr, PointerRNA value)