[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25546] trunk/blender: * register operators like other classes
Campbell Barton
ideasman42 at gmail.com
Thu Dec 24 20:50:43 CET 2009
Revision: 25546
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25546
Author: campbellbarton
Date: 2009-12-24 20:50:43 +0100 (Thu, 24 Dec 2009)
Log Message:
-----------
* register operators like other classes
* operators now return sets (converted into flags)
* can't remove bpy_operator_wrap.c since macro's still use the custom register funcs
Modified Paths:
--------------
trunk/blender/release/scripts/io/export_3ds.py
trunk/blender/release/scripts/io/export_fbx.py
trunk/blender/release/scripts/io/export_mdd.py
trunk/blender/release/scripts/io/export_obj.py
trunk/blender/release/scripts/io/export_ply.py
trunk/blender/release/scripts/io/export_x3d.py
trunk/blender/release/scripts/io/import_anim_bvh.py
trunk/blender/release/scripts/io/import_scene_3ds.py
trunk/blender/release/scripts/io/import_scene_obj.py
trunk/blender/release/scripts/io/netrender/operators.py
trunk/blender/release/scripts/io/netrender/utils.py
trunk/blender/release/scripts/modules/bpy/ops.py
trunk/blender/release/scripts/modules/rna_info.py
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/release/scripts/op/add_armature_human.py
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/release/scripts/op/console_python.py
trunk/blender/release/scripts/op/console_shell.py
trunk/blender/release/scripts/op/mesh.py
trunk/blender/release/scripts/op/mesh_skin.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/op/screen_play_rendered_anim.py
trunk/blender/release/scripts/op/uvcalc_follow_active.py
trunk/blender/release/scripts/op/uvcalc_smart_project.py
trunk/blender/release/scripts/op/vertexpaint_dirt.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/release/scripts/templates/operator_simple.py
trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
trunk/blender/release/scripts/ui/space_console.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/include/ED_keyframes_edit.h
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/release/scripts/io/export_3ds.py
===================================================================
--- trunk/blender/release/scripts/io/export_3ds.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/export_3ds.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -1126,7 +1126,7 @@
def execute(self, context):
save_3ds(self.properties.path, context)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
@@ -1136,7 +1136,7 @@
def poll(self, context): # Poll isnt working yet
return context.active_object != None
-bpy.ops.add(Export3DS)
+bpy.types.register(Export3DS)
# Add to a menu
import dynamic_menu
Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/export_fbx.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -3426,7 +3426,7 @@
self.properties.BATCH_FILE_PREFIX,
self.properties.BATCH_OWN_DIR)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
@@ -3434,7 +3434,7 @@
return ('RUNNING_MODAL',)
-bpy.ops.add(ExportFBX)
+bpy.types.register(ExportFBX)
# if __name__ == "__main__":
# bpy.ops.EXPORT_OT_ply(filename="/tmp/test.ply")
Modified: trunk/blender/release/scripts/io/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/export_mdd.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/export_mdd.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -173,14 +173,14 @@
raise Exception("filename not set")
write(self.properties.path, context.scene, context.active_object,
self.properties.start_frame, self.properties.end_frame, self.properties.fps)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
return ('RUNNING_MODAL',)
-bpy.ops.add(ExportMDD)
+bpy.types.register(ExportMDD)
# Add to a menu
import dynamic_menu
Modified: trunk/blender/release/scripts/io/export_obj.py
===================================================================
--- trunk/blender/release/scripts/io/export_obj.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/export_obj.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -980,7 +980,7 @@
EXPORT_SEL_ONLY=self.properties.use_selection,
EXPORT_ALL_SCENES=self.properties.use_all_scenes)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
@@ -991,7 +991,7 @@
-bpy.ops.add(ExportOBJ)
+bpy.types.register(ExportOBJ)
import dynamic_menu
Modified: trunk/blender/release/scripts/io/export_ply.py
===================================================================
--- trunk/blender/release/scripts/io/export_ply.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/export_ply.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -297,7 +297,7 @@
EXPORT_COLORS=self.properties.use_colors,
)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
@@ -316,7 +316,7 @@
row.prop(props, "use_colors")
-bpy.ops.add(ExportPLY)
+bpy.types.register(ExportPLY)
import dynamic_menu
Modified: trunk/blender/release/scripts/io/export_x3d.py
===================================================================
--- trunk/blender/release/scripts/io/export_x3d.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/export_x3d.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -1233,14 +1233,14 @@
def execute(self, context):
x3d_export(self.properties.path, context, self.properties.apply_modifiers, self.properties.triangulate, self.properties.compress)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
return ('RUNNING_MODAL',)
-bpy.ops.add(ExportX3D)
+bpy.types.register(ExportX3D)
import dynamic_menu
Modified: trunk/blender/release/scripts/io/import_anim_bvh.py
===================================================================
--- trunk/blender/release/scripts/io/import_anim_bvh.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/import_anim_bvh.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -887,7 +887,7 @@
read_bvh(context, self.properties.path)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
@@ -895,7 +895,7 @@
return ('RUNNING_MODAL',)
-bpy.ops.add(BvhImporter)
+bpy.types.register(BvhImporter)
import dynamic_menu
Modified: trunk/blender/release/scripts/io/import_scene_3ds.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_3ds.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/import_scene_3ds.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -1159,14 +1159,14 @@
def execute(self, context):
load_3ds(self.properties.path, context, 0.0, False, False)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
return ('RUNNING_MODAL',)
-bpy.ops.add(IMPORT_OT_autodesk_3ds)
+bpy.types.register(IMPORT_OT_autodesk_3ds)
import dynamic_menu
menu_func = lambda self, context: self.layout.operator(IMPORT_OT_autodesk_3ds.bl_idname, text="3D Studio (.3ds)...")
Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/import_scene_obj.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -1616,7 +1616,7 @@
self.properties.IMAGE_SEARCH,
self.properties.POLYGROUPS)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
wm = context.manager
@@ -1624,7 +1624,7 @@
return ('RUNNING_MODAL',)
-bpy.ops.add(IMPORT_OT_obj)
+bpy.types.register(IMPORT_OT_obj)
import dynamic_menu
Modified: trunk/blender/release/scripts/io/netrender/operators.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/operators.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/netrender/operators.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -79,7 +79,7 @@
#bpy.ops.wm.save_mainfile(path = path + os.sep + root + "_baked.blend")
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -106,7 +106,7 @@
bpy.ops.screen.render('INVOKE_AREA', animation=True)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -136,7 +136,7 @@
self.report('ERROR', str(err))
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -176,7 +176,7 @@
job.name = j.name
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -206,7 +206,7 @@
netsettings.slaves.remove(netsettings.active_slave_index)
netsettings.active_slave_index = -1
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -236,7 +236,7 @@
netsettings.slaves_blacklist.remove(netsettings.active_blacklisted_slave_index)
netsettings.active_blacklisted_slave_index = -1
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -282,7 +282,7 @@
slave = netsettings.slaves[-1]
slave.name = s.name
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -311,7 +311,7 @@
netsettings.jobs.remove(netsettings.active_job_index)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -338,7 +338,7 @@
while(len(netsettings.jobs) > 0):
netsettings.jobs.remove(0)
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -383,7 +383,7 @@
conn.close()
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -406,7 +406,7 @@
netsettings.server_address = address
netsettings.server_port = port
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
@@ -432,7 +432,7 @@
webbrowser.open("http://%s:%i" % (netsettings.server_address, netsettings.server_port))
- return ('FINISHED',)
+ return {'FINISHED'}
def invoke(self, context, event):
return self.execute(context)
Modified: trunk/blender/release/scripts/io/netrender/utils.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/utils.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/io/netrender/utils.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -62,7 +62,7 @@
return rna_type
def rnaOperator(rna_op):
- if bpy: bpy.ops.add(rna_op)
+ if bpy: bpy.types.register(rna_op)
return rna_op
def reporting(report, message, errorType = None):
Modified: trunk/blender/release/scripts/modules/bpy/ops.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/ops.py 2009-12-24 16:10:26 UTC (rev 25545)
+++ trunk/blender/release/scripts/modules/bpy/ops.py 2009-12-24 19:50:43 UTC (rev 25546)
@@ -21,7 +21,7 @@
# for slightly faster access
from _bpy import ops as ops_module
-op_add = ops_module.add
+# op_add = ops_module.add
op_remove = ops_module.remove
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list