diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-12-25 00:17:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-25 00:17:14 +0300 |
commit | 5f4e24d5990a7ecd6198ee394da8b7c07277cd91 (patch) | |
tree | 9a1909d90276f0243d50c6624da43c794cc52dad /release | |
parent | 4b8bc301c62784d111f2cffcbc35cf9c6189e37b (diff) |
operator draw function working again. needed to add layout to the operator to give access to "self.layout" - like panels, headers and manu's have
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/io/export_3ds.py | 2 | ||||
-rw-r--r-- | release/scripts/io/export_fbx.py | 2 | ||||
-rw-r--r-- | release/scripts/io/export_mdd.py | 2 | ||||
-rw-r--r-- | release/scripts/io/export_obj.py | 2 | ||||
-rw-r--r-- | release/scripts/io/export_ply.py | 2 | ||||
-rw-r--r-- | release/scripts/io/export_x3d.py | 2 | ||||
-rw-r--r-- | release/scripts/io/import_anim_bvh.py | 2 | ||||
-rw-r--r-- | release/scripts/io/import_scene_3ds.py | 2 | ||||
-rw-r--r-- | release/scripts/io/import_scene_obj.py | 2 | ||||
-rw-r--r-- | release/scripts/modules/rna_prop_ui.py | 2 | ||||
-rw-r--r-- | release/scripts/op/object.py | 2 | ||||
-rw-r--r-- | release/scripts/op/presets.py | 2 | ||||
-rw-r--r-- | release/scripts/op/wm.py | 6 | ||||
-rw-r--r-- | release/scripts/templates/operator.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_armature_rigify.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_userpref.py | 2 |
16 files changed, 18 insertions, 18 deletions
diff --git a/release/scripts/io/export_3ds.py b/release/scripts/io/export_3ds.py index a60aeeb3cb2..163b683f60f 100644 --- a/release/scripts/io/export_3ds.py +++ b/release/scripts/io/export_3ds.py @@ -1131,7 +1131,7 @@ class Export3DS(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} def poll(self, context): # Poll isnt working yet return context.active_object != None diff --git a/release/scripts/io/export_fbx.py b/release/scripts/io/export_fbx.py index 401f645536f..19a3345bd94 100644 --- a/release/scripts/io/export_fbx.py +++ b/release/scripts/io/export_fbx.py @@ -3431,7 +3431,7 @@ class ExportFBX(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} bpy.types.register(ExportFBX) diff --git a/release/scripts/io/export_mdd.py b/release/scripts/io/export_mdd.py index 22e76ae2427..66db8c14027 100644 --- a/release/scripts/io/export_mdd.py +++ b/release/scripts/io/export_mdd.py @@ -178,7 +178,7 @@ class ExportMDD(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} bpy.types.register(ExportMDD) diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 9d9b0e88732..77acffe325c 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -985,7 +985,7 @@ class ExportOBJ(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} diff --git a/release/scripts/io/export_ply.py b/release/scripts/io/export_ply.py index 301fb4c5fe8..f27b76d2cbe 100644 --- a/release/scripts/io/export_ply.py +++ b/release/scripts/io/export_ply.py @@ -302,7 +302,7 @@ class ExportPLY(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} def draw(self, context): layout = self.layout diff --git a/release/scripts/io/export_x3d.py b/release/scripts/io/export_x3d.py index 95ddb21b21d..c4f1b53146f 100644 --- a/release/scripts/io/export_x3d.py +++ b/release/scripts/io/export_x3d.py @@ -1238,7 +1238,7 @@ class ExportX3D(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} bpy.types.register(ExportX3D) diff --git a/release/scripts/io/import_anim_bvh.py b/release/scripts/io/import_anim_bvh.py index 0ea8dbe5356..cd040012840 100644 --- a/release/scripts/io/import_anim_bvh.py +++ b/release/scripts/io/import_anim_bvh.py @@ -892,7 +892,7 @@ class BvhImporter(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} bpy.types.register(BvhImporter) diff --git a/release/scripts/io/import_scene_3ds.py b/release/scripts/io/import_scene_3ds.py index d11b242b764..608fc6bf5a2 100644 --- a/release/scripts/io/import_scene_3ds.py +++ b/release/scripts/io/import_scene_3ds.py @@ -1164,7 +1164,7 @@ class IMPORT_OT_autodesk_3ds(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} bpy.types.register(IMPORT_OT_autodesk_3ds) diff --git a/release/scripts/io/import_scene_obj.py b/release/scripts/io/import_scene_obj.py index e4a218fce4d..f135bfbb6c0 100644 --- a/release/scripts/io/import_scene_obj.py +++ b/release/scripts/io/import_scene_obj.py @@ -1621,7 +1621,7 @@ class IMPORT_OT_obj(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} bpy.types.register(IMPORT_OT_obj) diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index aac6431768d..a390acf7932 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -216,7 +216,7 @@ class WM_OT_properties_edit(bpy.types.Operator): #return wm.invoke_props_popup(self, event) wm.invoke_props_popup(self, event) - return ('RUNNING_MODAL',) + 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 1b421cac98c..08fac5d4d3c 100644 --- a/release/scripts/op/object.py +++ b/release/scripts/op/object.py @@ -63,7 +63,7 @@ class SelectPattern(bpy.types.Operator): wm = context.manager # return wm.invoke_props_popup(self, event) wm.invoke_props_popup(self, event) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} def draw(self, context): layout = self.layout diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index af338c9364d..76d84bc8b3d 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -61,7 +61,7 @@ class AddPresetBase(bpy.types.Operator): #return wm.invoke_props_popup(self, event) wm.invoke_props_popup(self, event) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} class AddPresetRender(AddPresetBase): diff --git a/release/scripts/op/wm.py b/release/scripts/op/wm.py index 58cc2743932..c0a61017156 100644 --- a/release/scripts/op/wm.py +++ b/release/scripts/op/wm.py @@ -354,7 +354,7 @@ class WM_OT_doc_edit(bpy.types.Operator): class_name, class_prop = doc_id.split('.') if not doc_new: - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} # check if this is an operator op_name = class_name.upper() + '_OT_' + class_prop @@ -367,7 +367,7 @@ class WM_OT_doc_edit(bpy.types.Operator): rna = op_class.bl_rna doc_orig = rna.description if doc_orig == doc_new: - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} print("op - old:'%s' -> new:'%s'" % (doc_orig, doc_new)) upload["title"] = 'OPERATOR %s:%s' % (doc_id, doc_orig) @@ -379,7 +379,7 @@ class WM_OT_doc_edit(bpy.types.Operator): rna = getattr(bpy.types, class_name).bl_rna doc_orig = rna.properties[class_prop].description if doc_orig == doc_new: - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} print("rna - old:'%s' -> new:'%s'" % (doc_orig, doc_new)) upload["title"] = 'RNA %s:%s' % (doc_id, doc_orig) diff --git a/release/scripts/templates/operator.py b/release/scripts/templates/operator.py index c6fb887b091..9402a931db8 100644 --- a/release/scripts/templates/operator.py +++ b/release/scripts/templates/operator.py @@ -38,7 +38,7 @@ class ExportSomeData(bpy.types.Operator): if True: # File selector wm.add_fileselect(self) # will run self.execute() - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} elif 0: # Redo popup return wm.invoke_props_popup(self, event) # diff --git a/release/scripts/ui/properties_data_armature_rigify.py b/release/scripts/ui/properties_data_armature_rigify.py index 12f1b0ed5e5..c0270d9b8ca 100644 --- a/release/scripts/ui/properties_data_armature_rigify.py +++ b/release/scripts/ui/properties_data_armature_rigify.py @@ -275,7 +275,7 @@ class AsScript(bpy.types.Operator): self.properties.path = os.path.splitext(bpy.data.filename)[0] + "-" + bpy.utils.clean_name(obj.name) + ".py" wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} # operators that use the GUI diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 08efb92f00e..99cab8f9ac2 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -1741,7 +1741,7 @@ class WM_OT_keyconfig_export(bpy.types.Operator): def invoke(self, context, event): wm = context.manager wm.add_fileselect(self) - return ('RUNNING_MODAL',) + return {'RUNNING_MODAL'} class WM_OT_keymap_edit(bpy.types.Operator): |