diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-12-07 03:16:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-07 03:16:57 +0300 |
| commit | 750764f411d18b5f57cac3857cf201d4e9425521 (patch) | |
| tree | e0de3ecab9cefe266080f9962a848e32c6e58c0f /release | |
| parent | 85773c72303962f03c2a2d62bb26e042da8dd4b7 (diff) | |
rna flag PROP_ENUM_FLAG which makes rna props a tuple of enums when converted into a PyObject
only used by wm.invoke_props_popup() currently
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/rna_prop_ui.py | 4 | ||||
| -rw-r--r-- | release/scripts/op/object.py | 3 | ||||
| -rw-r--r-- | release/scripts/op/presets.py | 3 | ||||
| -rw-r--r-- | release/scripts/op/wm.py | 3 | ||||
| -rw-r--r-- | release/scripts/templates/operator.py | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index 51281c480b9..ca452da7f73 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -212,8 +212,12 @@ class WM_OT_properties_edit(bpy.types.Operator): self.properties.description = prop_ui.get("description", "") wm = context.manager + # This crashes, TODO - fix + #return wm.invoke_props_popup(self, event) + wm.invoke_props_popup(self, event) return ('RUNNING_MODAL',) + class WM_OT_properties_add(bpy.types.Operator): diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py index db50412464b..8a02d10838b 100644 --- a/release/scripts/op/object.py +++ b/release/scripts/op/object.py @@ -61,8 +61,7 @@ class SelectPattern(bpy.types.Operator): def invoke(self, context, event): wm = context.manager - wm.invoke_props_popup(self, event) - return ('RUNNING_MODAL',) + return wm.invoke_props_popup(self, event) def draw(self, context): layout = self.layout diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index 84a60765fa4..0ce19f712ab 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -54,6 +54,9 @@ class AddPresetBase(bpy.types.Operator): def invoke(self, context, event): wm = context.manager + #crashes, TODO - fix + #return wm.invoke_props_popup(self, event) + wm.invoke_props_popup(self, event) return ('RUNNING_MODAL',) diff --git a/release/scripts/op/wm.py b/release/scripts/op/wm.py index c5fc18964bf..7000eaffebf 100644 --- a/release/scripts/op/wm.py +++ b/release/scripts/op/wm.py @@ -359,8 +359,7 @@ class WM_OT_doc_edit(bpy.types.Operator): def invoke(self, context, event): wm = context.manager - wm.invoke_props_popup(self, event) - return ('RUNNING_MODAL',) + return wm.invoke_props_popup(self, event) class WM_OT_reload_scripts(bpy.types.Operator): diff --git a/release/scripts/templates/operator.py b/release/scripts/templates/operator.py index 5e8a2f33cb7..72a6ae53f5f 100644 --- a/release/scripts/templates/operator.py +++ b/release/scripts/templates/operator.py @@ -41,8 +41,7 @@ class ExportSomeData(bpy.types.Operator): return ('RUNNING_MODAL',) elif 0: # Redo popup - wm.invoke_props_popup(self, event) # - return ('RUNNING_MODAL',) + return wm.invoke_props_popup(self, event) # elif 0: return self.execute(context) |