[Bf-blender-cvs] [ede19477c82] blender2.8: Fix T54765: build error on macOS.
Brecht Van Lommel
noreply at git.blender.org
Mon Apr 23 13:43:25 CEST 2018
Commit: ede19477c825a52aaca224eb72fd708adc7871f9
Author: Brecht Van Lommel
Date: Sun Apr 22 23:34:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBede19477c825a52aaca224eb72fd708adc7871f9
Fix T54765: build error on macOS.
===================================================================
M source/blender/editors/screen/area.c
===================================================================
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 588a2abec53..00b70dc9f66 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -660,13 +660,6 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea
return;
}
- /* can't click on bottom corners on OS X, already used for resizing */
-#ifdef __APPLE__
- if (!(sa->totrct.xmin == 0 && sa->totrct.ymin == 0) || WM_window_is_fullscreen(win))
-#else
- (void)win;
-#endif
-
float coords[4][4] = {
/* Bottom-left. */
{sa->totrct.xmin,
@@ -690,6 +683,17 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea
sa->totrct.ymax - (AZONESPOT - 1)}};
for (int i = 0; i < 4; i++) {
+ /* can't click on bottom corners on OS X, already used for resizing */
+#ifdef __APPLE__
+ if (!WM_window_is_fullscreen(win) &&
+ ((coords[i][0] == 0 && coords[i][1] == 0) ||
+ (coords[i][0] == WM_window_pixels_x(win) && coords[i][1] == 0))) {
+ continue;
+ }
+#else
+ (void)win;
+#endif
+
/* set area action zones */
az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
BLI_addtail(&(sa->actionzones), az);
More information about the Bf-blender-cvs
mailing list