diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-22 11:51:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-22 11:51:23 +0300 |
| commit | 1de7a0c0dc011a9286f14552858f10efc64d5f91 (patch) | |
| tree | 1957a7ddac128dd6c1fa88aa900ccbd5752800c8 /release/scripts/modules/bpy_types.py | |
| parent | e597f7495abcb5eedf8db27b4c4a72b3a58b727e (diff) | |
| parent | 420e379e99a3351b2dd2a46989aa1d50bdf8abef (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/modules/bpy_types.py')
| -rw-r--r-- | release/scripts/modules/bpy_types.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 511fc7e8d1e..1124070fea2 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -137,12 +137,12 @@ class WindowManager(bpy_types.ID): def popup_menu(self, draw_func, title="", icon='NONE'): import bpy - popup = self.pupmenu_begin__internal(title, icon) + popup = self.popmenu_begin__internal(title, icon) try: draw_func(popup, bpy.context) finally: - self.pupmenu_end__internal(popup) + self.popmenu_end__internal(popup) def popup_menu_pie(self, event, draw_func, title="", icon='NONE'): import bpy |