Merge branch 'master' into blender2.8

2018-04-22 10:51:23 +02:00
parent e597f7495a 420e379e99
commit 1de7a0c0dc
5 changed files with 32 additions and 40 deletions
--- 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