[Bf-blender-cvs] [e55e23a9d5d] soc-2019-outliner: Datadropper: Cleanup

Nathan Craddock noreply at git.blender.org
Sat Aug 3 22:02:14 CEST 2019


Commit: e55e23a9d5d73af02f1ea70ad5e9a60f9b254969
Author: Nathan Craddock
Date:   Sat Aug 3 13:59:45 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBe55e23a9d5d73af02f1ea70ad5e9a60f9b254969

Datadropper: Cleanup

Renamed area_current to cursor_area for clarity

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

M	source/blender/editors/interface/interface_eyedropper_datablock.c

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

diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c
index dc1b8d786ff..efbe5922aa5 100644
--- a/source/blender/editors/interface/interface_eyedropper_datablock.c
+++ b/source/blender/editors/interface/interface_eyedropper_datablock.c
@@ -68,7 +68,7 @@ typedef struct DataDropper {
 
   ID *init_id; /* for resetting on cancel */
 
-  ScrArea *area_current;
+  ScrArea *cursor_area; /* Area under the cursor */
   ARegionType *art;
   void *draw_handle_pixel;
   char name[200];
@@ -105,7 +105,7 @@ static int datadropper_init(bContext *C, wmOperator *op)
 
   ddr->is_undo = UI_but_flag_is_set(but, UI_BUT_UNDO);
 
-  ddr->area_current = CTX_wm_area(C);
+  ddr->cursor_area = CTX_wm_area(C);
   ddr->art = art;
   ddr->draw_handle_pixel = ED_region_draw_cb_activate(
       art, datadropper_draw_cb, ddr, REGION_DRAW_POST_PIXEL);
@@ -252,18 +252,18 @@ static void datadropper_set_draw_callback_region(bContext *C,
 
   if (sa) {
     /* If spacetype changed */
-    if (sa->spacetype != ddr->area_current->spacetype) {
+    if (sa->spacetype != ddr->cursor_area->spacetype) {
       /* Remove old callback */
       ED_region_draw_cb_exit(ddr->art, ddr->draw_handle_pixel);
 
       /* Redraw old area */
-      ARegion *ar = BKE_area_find_region_type(ddr->area_current, RGN_TYPE_WINDOW);
+      ARegion *ar = BKE_area_find_region_type(ddr->cursor_area, RGN_TYPE_WINDOW);
       ED_region_tag_redraw(ar);
 
       /* Set draw callback in new region */
       ARegionType *art = BKE_regiontype_from_id(sa->type, RGN_TYPE_WINDOW);
 
-      ddr->area_current = sa;
+      ddr->cursor_area = sa;
       ddr->art = art;
       ddr->draw_handle_pixel = ED_region_draw_cb_activate(
           art, datadropper_draw_cb, ddr, REGION_DRAW_POST_PIXEL);



More information about the Bf-blender-cvs mailing list