diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-20 16:40:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-20 16:40:14 +0300 |
| commit | 12e926781a2ea332cb6c0c0e7b32b31c1aea27c5 (patch) | |
| tree | 809a87f7cc77b7cae8b5df252004e9ef578d5e0c /source/blender/editors/screen/screen_intern.h | |
| parent | 3df5625ae73268df1967e704531cf19af1e59d9f (diff) | |
| parent | 5cad6afac663b05819f5e5a887ec31515a2cf16c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen/screen_intern.h')
| -rw-r--r-- | source/blender/editors/screen/screen_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index b02198764e0..89c2b1563c4 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -67,7 +67,7 @@ ScrEdge *screen_find_active_scredge( const wmWindow *win, const bScreen *screen, const int mx, const int my); -struct AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2]); +struct AZone *ED_area_actionzone_find_xy(ScrArea *sa, const int xy[2]); /* screen_context.c */ int ed_screen_context( |