[Bf-blender-cvs] [8949eab27ef] master: Cleanup: warnings

Campbell Barton noreply at git.blender.org
Fri Aug 27 03:50:03 CEST 2021


Commit: 8949eab27ef86a5c506da1c481438999bd5ebb47
Author: Campbell Barton
Date:   Fri Aug 27 11:47:34 2021 +1000
Branches: master
https://developer.blender.org/rB8949eab27ef86a5c506da1c481438999bd5ebb47

Cleanup: warnings

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

M	source/blender/editors/interface/interface_eyedropper.c
M	source/blender/editors/interface/interface_eyedropper_datablock.c
M	source/blender/editors/interface/interface_eyedropper_depth.c
M	source/blender/editors/interface/interface_eyedropper_intern.h

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

diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 13566a59910..2e7b0ce532c 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -125,10 +125,7 @@ void eyedropper_draw_cursor_text_window(const struct wmWindow *window, const cha
   eyedropper_draw_cursor_text_ex(x, y, name);
 }
 
-void eyedropper_draw_cursor_text_region(const struct bContext *C,
-                                        const int x,
-                                        const int y,
-                                        const char *name)
+void eyedropper_draw_cursor_text_region(const int x, const int y, const char *name)
 {
   if (name[0] == '\0') {
     return;
diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c
index 0eeeb0a39e4..4996c803dfe 100644
--- a/source/blender/editors/interface/interface_eyedropper_datablock.c
+++ b/source/blender/editors/interface/interface_eyedropper_datablock.c
@@ -75,10 +75,12 @@ typedef struct DataDropper {
   char name[200];
 } DataDropper;
 
-static void datadropper_draw_cb(const struct bContext *C, ARegion *region, void *arg)
+static void datadropper_draw_cb(const struct bContext *UNUSED(C),
+                                ARegion *UNUSED(region),
+                                void *arg)
 {
   DataDropper *ddr = arg;
-  eyedropper_draw_cursor_text_region(C, UNPACK2(ddr->name_pos), ddr->name);
+  eyedropper_draw_cursor_text_region(UNPACK2(ddr->name_pos), ddr->name);
 }
 
 static int datadropper_init(bContext *C, wmOperator *op)
@@ -254,7 +256,7 @@ static void datadropper_cancel(bContext *C, wmOperator *op)
 }
 
 /* To switch the draw callback when region under mouse event changes */
-static void datadropper_set_draw_callback_region(bContext *C, ScrArea *area, DataDropper *ddr)
+static void datadropper_set_draw_callback_region(ScrArea *area, DataDropper *ddr)
 {
   if (area) {
     /* If spacetype changed */
@@ -311,7 +313,7 @@ static int datadropper_modal(bContext *C, wmOperator *op, const wmEvent *event)
     datadropper_win_area_find(C, mval, mval, &win, &area);
 
     /* Set the region for eyedropper cursor text drawing */
-    datadropper_set_draw_callback_region(C, area, ddr);
+    datadropper_set_draw_callback_region(area, ddr);
 
     datadropper_id_sample_pt(C, win, area, ddr, mval[0], mval[1], &id);
   }
diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c
index 6f272201085..311f718d950 100644
--- a/source/blender/editors/interface/interface_eyedropper_depth.c
+++ b/source/blender/editors/interface/interface_eyedropper_depth.c
@@ -76,10 +76,12 @@ typedef struct DepthDropper {
   char name[200];
 } DepthDropper;
 
-static void depthdropper_draw_cb(const struct bContext *C, ARegion *region, void *arg)
+static void depthdropper_draw_cb(const struct bContext *UNUSED(C),
+                                 ARegion *UNUSED(region),
+                                 void *arg)
 {
   DepthDropper *ddr = arg;
-  eyedropper_draw_cursor_text_region(C, UNPACK2(ddr->name_pos), ddr->name);
+  eyedropper_draw_cursor_text_region(UNPACK2(ddr->name_pos), ddr->name);
 }
 
 static int depthdropper_init(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/interface/interface_eyedropper_intern.h b/source/blender/editors/interface/interface_eyedropper_intern.h
index 4295a781af8..f9f3fcfb5d1 100644
--- a/source/blender/editors/interface/interface_eyedropper_intern.h
+++ b/source/blender/editors/interface/interface_eyedropper_intern.h
@@ -24,10 +24,7 @@
 
 /* interface_eyedropper.c */
 void eyedropper_draw_cursor_text_window(const struct wmWindow *window, const char *name);
-void eyedropper_draw_cursor_text_region(const struct bContext *C,
-                                        const int x,
-                                        const int y,
-                                        const char *name);
+void eyedropper_draw_cursor_text_region(const int x, const int y, const char *name);
 uiBut *eyedropper_get_property_button_under_mouse(bContext *C, const wmEvent *event);
 void datadropper_win_area_find(const struct bContext *C,
                                const int mval[2],



More information about the Bf-blender-cvs mailing list