[Bf-blender-cvs] [35da1afa09d] blender2.8: Cleanup: remove unused context args

Campbell Barton noreply at git.blender.org
Tue Jun 12 07:59:56 CEST 2018


Commit: 35da1afa09d98f1051391da53d17d81a586fe518
Author: Campbell Barton
Date:   Tue Jun 12 07:59:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB35da1afa09d98f1051391da53d17d81a586fe518

Cleanup: remove unused context args

===================================================================

M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_region_popup.c
M	source/blender/editors/interface/interface_region_search.c
M	source/blender/editors/interface/interface_region_tooltip.c
M	source/blender/editors/screen/area.c

===================================================================

diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index a2245dcc16e..2291e70fa4d 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -69,8 +69,8 @@ void    ED_region_do_layout(struct bContext *C, struct ARegion *ar);
 void    ED_region_do_draw(struct bContext *C, struct ARegion *ar);
 void    ED_region_exit(struct bContext *C, struct ARegion *ar);
 void    ED_region_pixelspace(struct ARegion *ar);
-void    ED_region_update_rect(struct bContext *C, struct ARegion *ar);
-void    ED_region_init(struct bContext *C, struct ARegion *ar);
+void    ED_region_update_rect(struct ARegion *ar);
+void    ED_region_init(struct ARegion *ar);
 void    ED_region_tag_redraw(struct ARegion *ar);
 void    ED_region_tag_redraw_partial(struct ARegion *ar, const struct rcti *rct);
 void    ED_region_tag_redraw_overlay(struct ARegion *ar);
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 02844f5e861..74ecc20ebe0 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -9136,7 +9136,7 @@ static int ui_handle_menu_event(
 
 				add_v2_v2v2_int(menu->popup_create_vars.event_xy, menu->popup_create_vars.event_xy, mdiff);
 
-				ui_popup_translate(C, ar, mdiff);
+				ui_popup_translate(ar, mdiff);
 			}
 
 			return retval;
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index b5bf9be737b..74ca7978b65 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -652,7 +652,7 @@ void ui_pie_menu_level_create(
         const EnumPropertyItem *items, int totitem, int context, int flag);
 
 /* interface_region_popup.c */
-void ui_popup_translate(struct bContext *C, struct ARegion *ar, const int mdiff[2]);
+void ui_popup_translate(struct ARegion *ar, const int mdiff[2]);
 void ui_popup_block_free(struct bContext *C, uiPopupBlockHandle *handle);
 void ui_popup_block_scrolltest(struct uiBlock *block);
 
diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c
index 654dc5e4d30..0ac4d4d28ec 100644
--- a/source/blender/editors/interface/interface_region_popup.c
+++ b/source/blender/editors/interface/interface_region_popup.c
@@ -63,13 +63,13 @@
 /**
  * Translate any popup regions (so we can drag them).
  */
-void ui_popup_translate(bContext *C, ARegion *ar, const int mdiff[2])
+void ui_popup_translate(ARegion *ar, const int mdiff[2])
 {
 	uiBlock *block;
 
 	BLI_rcti_translate(&ar->winrct, UNPACK2(mdiff));
 
-	ED_region_update_rect(C, ar);
+	ED_region_update_rect(ar);
 
 	ED_region_tag_redraw(ar);
 
@@ -625,7 +625,7 @@ uiBlock *ui_popup_block_refresh(
 	ui_popup_block_scrolltest(block);
 
 	/* adds subwindow */
-	ED_region_init(C, ar);
+	ED_region_init(ar);
 
 	/* get winmat now that we actually have the subwindow */
 	wmGetProjectionMatrix(block->winmat, &ar->winrct);
@@ -633,7 +633,7 @@ uiBlock *ui_popup_block_refresh(
 	/* notify change and redraw */
 	ED_region_tag_redraw(ar);
 
-	ED_region_update_rect(C, ar);
+	ED_region_update_rect(ar);
 
 #ifdef DEBUG
 	window->eventstate = event_back;
diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c
index f14f9af8785..aa4b731a3d5 100644
--- a/source/blender/editors/interface/interface_region_search.c
+++ b/source/blender/editors/interface/interface_region_search.c
@@ -625,7 +625,7 @@ ARegion *ui_searchbox_create_generic(bContext *C, ARegion *butregion, uiBut *but
 	}
 
 	/* adds subwindow */
-	ED_region_init(C, ar);
+	ED_region_init(ar);
 
 	/* notify change and redraw */
 	ED_region_tag_redraw(ar);
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index aa8fe173638..ed83a715c7e 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -867,7 +867,7 @@ static ARegion *ui_tooltip_create_with_data(
 	}
 
 	/* adds subwindow */
-	ED_region_init(C, ar);
+	ED_region_init(ar);
 
 	/* notify change and redraw */
 	ED_region_tag_redraw(ar);
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index a5083246ac1..4eef386dd04 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1480,13 +1480,13 @@ static void region_update_rect(ARegion *ar)
 /**
  * Call to move a popup window (keep OpenGL context free!)
  */
-void ED_region_update_rect(bContext *UNUSED(C), ARegion *ar)
+void ED_region_update_rect(ARegion *ar)
 {
 	region_update_rect(ar);
 }
 
 /* externally called for floating regions like menus */
-void ED_region_init(bContext *UNUSED(C), ARegion *ar)
+void ED_region_init(ARegion *ar)
 {
 	/* refresh can be called before window opened */
 	region_subwindow(ar);



More information about the Bf-blender-cvs mailing list