[Bf-blender-cvs] [ef8aca65d8b] master: Cleanup: renamed `do_draw_overlay` to `do_draw_paintcursor`
Jeroen Bakker
noreply at git.blender.org
Tue Jun 23 12:08:56 CEST 2020
Commit: ef8aca65d8b8bbe66e6ebca144088ed2b685cbb0
Author: Jeroen Bakker
Date: Tue Jun 23 12:07:50 2020 +0200
Branches: master
https://developer.blender.org/rBef8aca65d8b8bbe66e6ebca144088ed2b685cbb0
Cleanup: renamed `do_draw_overlay` to `do_draw_paintcursor`
To make a better distinction with region overlay.
===================================================================
M source/blender/editors/screen/area.c
M source/blender/makesdna/DNA_screen_types.h
M source/blender/windowmanager/intern/wm_draw.c
===================================================================
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 63366044f88..54a9eced0da 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -646,7 +646,7 @@ void ED_region_tag_redraw(ARegion *region)
void ED_region_tag_redraw_cursor(ARegion *region)
{
if (region) {
- region->do_draw_overlay = RGN_DRAW;
+ region->do_draw_paintcursor = RGN_DRAW;
}
}
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index d60409eb0d6..eb9f1c1a80a 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -427,7 +427,7 @@ typedef struct ARegion {
/** Private, cached notifier events. */
short do_draw;
/** Private, cached notifier events. */
- short do_draw_overlay;
+ short do_draw_paintcursor;
/** Private, set for indicate drawing overlapped. */
short overlap;
/** Temporary copy of flag settings for clean fullscreen. */
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index c0a9d0ac453..6a19ce62f50 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -931,9 +931,9 @@ static bool wm_draw_update_test_window(Main *bmain, bContext *C, wmWindow *win)
bool do_draw = false;
for (region = screen->regionbase.first; region; region = region->next) {
- if (region->do_draw_overlay) {
+ if (region->do_draw_paintcursor) {
screen->do_draw_paintcursor = true;
- region->do_draw_overlay = false;
+ region->do_draw_paintcursor = false;
}
if (region->visible && region->do_draw) {
do_draw = true;
More information about the Bf-blender-cvs
mailing list