[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25548] trunk/blender: operator draw function working again.
Campbell Barton
ideasman42 at gmail.com
Thu Dec 24 22:17:15 CET 2009
Revision: 25548
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25548
Author: campbellbarton
Date: 2009-12-24 22:17:14 +0100 (Thu, 24 Dec 2009)
Log Message:
-----------
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
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/modules/rna_prop_ui.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/editors/space_file/file_panels.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/windowmanager/WM_types.h
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 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/export_3ds.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -1131,7 +1131,7 @@
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
Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/export_fbx.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -3431,7 +3431,7 @@
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
- return ('RUNNING_MODAL',)
+ return {'RUNNING_MODAL'}
bpy.types.register(ExportFBX)
Modified: trunk/blender/release/scripts/io/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/export_mdd.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/export_mdd.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -178,7 +178,7 @@
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
- return ('RUNNING_MODAL',)
+ return {'RUNNING_MODAL'}
bpy.types.register(ExportMDD)
Modified: trunk/blender/release/scripts/io/export_obj.py
===================================================================
--- trunk/blender/release/scripts/io/export_obj.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/export_obj.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -985,7 +985,7 @@
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
- return ('RUNNING_MODAL',)
+ return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/io/export_ply.py
===================================================================
--- trunk/blender/release/scripts/io/export_ply.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/export_ply.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -302,7 +302,7 @@
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
Modified: trunk/blender/release/scripts/io/export_x3d.py
===================================================================
--- trunk/blender/release/scripts/io/export_x3d.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/export_x3d.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -1238,7 +1238,7 @@
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
- return ('RUNNING_MODAL',)
+ return {'RUNNING_MODAL'}
bpy.types.register(ExportX3D)
Modified: trunk/blender/release/scripts/io/import_anim_bvh.py
===================================================================
--- trunk/blender/release/scripts/io/import_anim_bvh.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/import_anim_bvh.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -892,7 +892,7 @@
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
- return ('RUNNING_MODAL',)
+ return {'RUNNING_MODAL'}
bpy.types.register(BvhImporter)
Modified: trunk/blender/release/scripts/io/import_scene_3ds.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_3ds.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/import_scene_3ds.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -1164,7 +1164,7 @@
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)
Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/io/import_scene_obj.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -1621,7 +1621,7 @@
def invoke(self, context, event):
wm = context.manager
wm.add_fileselect(self)
- return ('RUNNING_MODAL',)
+ return {'RUNNING_MODAL'}
bpy.types.register(IMPORT_OT_obj)
Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -216,7 +216,7 @@
#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):
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/op/object.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -63,7 +63,7 @@
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
Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/op/presets.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -61,7 +61,7 @@
#return wm.invoke_props_popup(self, event)
wm.invoke_props_popup(self, event)
- return ('RUNNING_MODAL',)
+ return {'RUNNING_MODAL'}
class AddPresetRender(AddPresetBase):
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/op/wm.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -354,7 +354,7 @@
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 @@
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 @@
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)
Modified: trunk/blender/release/scripts/templates/operator.py
===================================================================
--- trunk/blender/release/scripts/templates/operator.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/templates/operator.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -38,7 +38,7 @@
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) #
Modified: trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -275,7 +275,7 @@
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
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2009-12-24 21:17:14 UTC (rev 25548)
@@ -1741,7 +1741,7 @@
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):
Modified: trunk/blender/source/blender/editors/space_file/file_panels.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_panels.c 2009-12-24 21:15:27 UTC (rev 25547)
+++ trunk/blender/source/blender/editors/space_file/file_panels.c 2009-12-24 21:17:14 UTC (rev 25548)
@@ -175,7 +175,9 @@
int empty= 1, flag;
if(op->type->ui) {
- op->type->ui((bContext*)C, op, pa->layout);
+ op->layout= pa->layout;
+ op->type->ui((bContext*)C, op);
+ op->layout= NULL;
}
else {
RNA_STRUCT_BEGIN(op->ptr, prop) {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list