[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32817] trunk/blender/release/scripts: [ #24491] not possible to create a new Rendering preset than " add render preset.py"
Campbell Barton
ideasman42 at gmail.com
Mon Nov 1 22:07:26 CET 2010
Revision: 32817
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32817
Author: campbellbarton
Date: 2010-11-01 22:07:25 +0100 (Mon, 01 Nov 2010)
Log Message:
-----------
[#24491] not possible to create a new Rendering preset than "add render preset.py"
- Setting operator properties was broken because of bpy_types.py meta-classing (surprising this wasn't noticed before!)
- Presets now use a dialog with an OK button.
- Presets use a check function on the filename so invalid chars are replaced editing.
- Submit docs operator was broken.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/op/wm.py
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2010-11-01 18:55:12 UTC (rev 32816)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2010-11-01 21:07:25 UTC (rev 32817)
@@ -650,14 +650,14 @@
properties = StructRNA.path_resolve(self, "properties")
bl_rna = getattr(properties, "bl_rna", None)
if bl_rna and attr in bl_rna.properties:
- setattr(properties, attr, value)
+ return setattr(properties, attr, value)
return super().__setattr__(attr, value)
def __delattr__(self, attr):
properties = StructRNA.path_resolve(self, "properties")
bl_rna = getattr(properties, "bl_rna", None)
if bl_rna and attr in bl_rna.properties:
- delattr(properties, attr)
+ return delattr(properties, attr)
return super().__delattr__(attr)
Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py 2010-11-01 18:55:12 UTC (rev 32816)
+++ trunk/blender/release/scripts/op/presets.py 2010-11-01 21:07:25 UTC (rev 32817)
@@ -54,7 +54,7 @@
return {'FINISHED'}
filename = self.as_filename(self.name)
-
+
target_path = bpy.utils.preset_paths(self.preset_subdir)[0] # we need some way to tell the user and system preset path
filepath = os.path.join(target_path, filename) + ".py"
@@ -76,9 +76,9 @@
file_preset.write("%s = %r\n" % (rna_path, value))
file_preset.close()
-
- preset_menu_class.bl_label = bpy.path.display_name(self.name)
+ preset_menu_class.bl_label = bpy.path.display_name(filename)
+
else:
preset_active = preset_menu_class.bl_label
@@ -108,10 +108,13 @@
return {'FINISHED'}
+ def check(self, context):
+ self.name = self.as_filename(self.name)
+
def invoke(self, context, event):
if not self.remove_active:
wm = context.window_manager
- return wm.invoke_props_popup(self, event)
+ return wm.invoke_props_dialog(self)
else:
return self.execute(context)
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2010-11-01 18:55:12 UTC (rev 32816)
+++ trunk/blender/release/scripts/op/wm.py 2010-11-01 21:07:25 UTC (rev 32817)
@@ -632,7 +632,7 @@
def draw(self, context):
layout = self.layout
- layout.label(text="Descriptor ID: '%s'" % props.doc_id)
+ layout.label(text="Descriptor ID: '%s'" % self.doc_id)
layout.prop(self, "doc_new", text="")
def invoke(self, context, event):
More information about the Bf-blender-cvs
mailing list