[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24740] trunk/blender/release/scripts: - aspectx wasnt saved in the render preset
Campbell Barton
ideasman42 at gmail.com
Sun Nov 22 00:55:14 CET 2009
Revision: 24740
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24740
Author: campbellbarton
Date: 2009-11-22 00:55:14 +0100 (Sun, 22 Nov 2009)
Log Message:
-----------
- aspectx wasnt saved in the render preset
- define a preset base class
- cleanup some comments and whitespace
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/__init__.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/modules/rna_prop_ui.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/preset_render.py
trunk/blender/release/scripts/op/vertexpaint_dirt.py
trunk/blender/release/scripts/op/wm.py
Modified: trunk/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/__init__.py 2009-11-21 23:25:23 UTC (rev 24739)
+++ trunk/blender/release/scripts/modules/bpy/__init__.py 2009-11-21 23:55:14 UTC (rev 24740)
@@ -41,14 +41,14 @@
def load_scripts(reload_scripts=False):
import traceback
-
+
def test_import(module_name):
try:
return __import__(module_name)
except:
traceback.print_exc()
return None
-
+
base_path = os.path.join(os.path.dirname(__file__), "..", "..")
base_path = os.path.normpath(base_path) # clean
@@ -64,7 +64,7 @@
mod = test_import(f)
else:
mod = None
-
+
if reload_scripts and mod:
print("Reloading:", mod)
reload(mod)
@@ -73,10 +73,10 @@
if "-d" in sys.argv and False: # Enable this to measure startup speed
import cProfile
cProfile.run('import bpy; bpy.load_scripts()', 'blender.prof')
-
+
import pstats
p = pstats.Stats('blender.prof')
p.sort_stats('cumulative').print_stats(100)
else:
- load_scripts()
\ No newline at end of file
+ load_scripts()
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2009-11-21 23:25:23 UTC (rev 24739)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2009-11-21 23:55:14 UTC (rev 24740)
@@ -22,14 +22,14 @@
class Context(StructRNA):
-
+
def copy(self):
new_context = {}
generic_keys = StructRNA.__dict__.keys()
for item in dir(self):
if item not in generic_keys:
new_context[item] = getattr(self, item)
-
+
return new_context
@@ -47,7 +47,7 @@
return i2,i1
class Mesh(bpy_types.ID):
-
+
def _get_edge_keys(self):
return [edge_key for face in self.faces for edge_key in face.edge_keys]
@@ -102,10 +102,9 @@
def __prepare__(name, bases, **kwargs):
return collections.OrderedDict()
+
+# Only defined so operators members can be used by accessing self.order
class Operator(StructRNA, metaclass=OrderedMeta):
- '''
- Only defined so operators members can be used by accessing self.order
- '''
pass
@@ -113,12 +112,8 @@
def path_menu(self, searchpath, operator):
layout = self.layout
+ # hard coded to set the operators 'path' to the filename.
- '''
- Unrelated to the class above, add menu items from the filesystem.
-
- hard coded to set the operators 'path' to the filename.
- '''
import os
def path_to_name(f):
Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-11-21 23:25:23 UTC (rev 24739)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-11-21 23:55:14 UTC (rev 24740)
@@ -32,12 +32,12 @@
def rna_idprop_ui_prop_get(item, prop, create=True):
-
+
rna_ui = rna_idprop_ui_get(item, create)
-
+
if rna_ui == None:
return None
-
+
try:
return rna_ui[prop]
except:
@@ -47,7 +47,7 @@
def rna_idprop_ui_prop_clear(item, prop):
rna_ui = rna_idprop_ui_get(item, False)
-
+
if rna_ui == None:
return
@@ -58,21 +58,21 @@
def draw(layout, context, context_member, use_edit = True):
-
+
def assign_props(prop, val, key):
prop.path = context_member
prop.property = key
-
+
try:
prop.value = str(val)
except:
pass
-
+
rna_item = eval("context." + context_member)
items = rna_item.items()
items.sort()
-
+
if use_edit:
row = layout.row()
props = row.itemO("wm.properties_add", properties=True, text="Add")
@@ -83,10 +83,10 @@
if key == '_RNA_UI':
continue
-
+
row = layout.row()
convert_to_pyobject = getattr(val, "convert_to_pyobject", None)
-
+
val_orig = val
if convert_to_pyobject:
val_draw = val = val.convert_to_pyobject()
@@ -101,24 +101,24 @@
row = split.row()
else:
row = box.row()
-
+
row.itemL(text=key)
-
+
# explicit exception for arrays
if convert_to_pyobject and not hasattr(val_orig, "len"):
row.itemL(text=val_draw)
else:
row.itemR(rna_item, '["%s"]' % key, text="")
-
+
if use_edit:
row = split.row(align=True)
prop = row.itemO("wm.properties_edit", properties=True, text="edit")
assign_props(prop, val_draw, key)
-
+
prop = row.itemO("wm.properties_remove", properties=True, text="", icon='ICON_ZOOMOUT')
assign_props(prop, val_draw, key)
-
+
from bpy.props import *
@@ -138,14 +138,14 @@
'''Internal use (edit a property path)'''
bl_idname = "wm.properties_edit"
bl_label = "Edit Property!"
-
+
path = rna_path
property = rna_property
value = rna_value
min = rna_min
max = rna_max
description = StringProperty(name="Tip", default="")
-
+
# the class instance is not persistant, need to store in the class
# not ideal but changes as the op runs.
_last_prop = ['']
@@ -160,72 +160,72 @@
value_eval = eval(value)
except:
value_eval = value
-
+
if type(value_eval) == str:
- value_eval = '"' + value_eval + '"'
-
+ value_eval = '"' + value_eval + '"'
+
# First remove
item = eval("context.%s" % path)
-
+
rna_idprop_ui_prop_clear(item, prop_old)
exec_str = "del item['%s']" % prop_old
# print(exec_str)
exec(exec_str)
-
-
+
+
# Reassign
exec_str = "item['%s'] = %s" % (prop, value_eval)
# print(exec_str)
exec(exec_str)
-
+
prop_type = type(item[prop])
-
+
prop_ui = rna_idprop_ui_prop_get(item, prop)
if prop_type in (float, int):
-
+
prop_ui['soft_min'] = prop_ui['min'] = prop_type(self.properties.min)
prop_ui['soft_max'] = prop_ui['max'] = prop_type(self.properties.max)
-
+
prop_ui['description'] = self.properties.description
-
+
return ('FINISHED',)
def invoke(self, context, event):
-
+
self._last_prop[:] = [self.properties.property]
-
+
item = eval("context.%s" % self.properties.path)
-
+
# setup defaults
prop_ui = rna_idprop_ui_prop_get(item, self.properties.property, False) # dont create
if prop_ui:
self.properties.min = prop_ui.get("min", -1000000000)
self.properties.max = prop_ui.get("max", 1000000000)
self.properties.description = prop_ui.get("description", "")
-
+
if 0:
- _message= "PyConsole, press Ctrl+D to unlock the BGE"
- import sys
-
- # evaluate commands in current namespace
- frame= sys._getframe()
- namespace = frame.f_globals.copy()
- namespace.update(frame.f_locals)
-
- import code
+ _message= "PyConsole, press Ctrl+D to unlock the BGE"
+ import sys
+ # evaluate commands in current namespace
+ frame= sys._getframe()
+ namespace = frame.f_globals.copy()
+ namespace.update(frame.f_locals)
+
+ import code
+
# Autocomp in python, not as comprehensive as IPython
import rlcompleter
-
+
try: # ick, some pythons dont have this
import readline
- readline.parse_and_bind("tab: complete")
+ readline.parse_and_bind("tab: complete")
except:
pass
code.interact(banner=_message, local=namespace)
-
+
wm = context.manager
wm.invoke_props_popup(self, event)
return ('RUNNING_MODAL',)
@@ -240,7 +240,7 @@
def execute(self, context):
item = eval("context.%s" % self.properties.path)
-
+
def unique_name(names):
prop = 'prop'
prop_new = prop
@@ -248,14 +248,14 @@
while prop_new in names:
prop_new = prop + str(i)
i+=1
-
+
return prop_new
-
+
property = unique_name(item.keys())
-
+
item[property] = 1.0
return ('FINISHED',)
-
+
class WM_OT_properties_remove(bpy.types.Operator):
'''Internal use (edit a property path)'''
bl_idname = "wm.properties_remove"
@@ -267,5 +267,5 @@
def execute(self, context):
item = eval("context.%s" % self.properties.path)
del item[self.properties.property]
- return ('FINISHED',)
+ return ('FINISHED',)
Modified: trunk/blender/release/scripts/op/console_python.py
===================================================================
--- trunk/blender/release/scripts/op/console_python.py 2009-11-21 23:25:23 UTC (rev 24739)
+++ trunk/blender/release/scripts/op/console_python.py 2009-11-21 23:55:14 UTC (rev 24740)
@@ -142,7 +142,7 @@
sc = context.space_data
console = get_console(hash(context.region))[0]
-
+
current_line = sc.history[-1]
line = current_line.line
Modified: trunk/blender/release/scripts/op/console_shell.py
===================================================================
--- trunk/blender/release/scripts/op/console_shell.py 2009-11-21 23:25:23 UTC (rev 24739)
+++ trunk/blender/release/scripts/op/console_shell.py 2009-11-21 23:55:14 UTC (rev 24740)
@@ -51,11 +51,11 @@
line = sc.history[-1].line
except:
return ('CANCELLED',)
-
+
bpy.ops.console.scrollback_append(text=sc.prompt + line, type='INPUT')
-
+
shell_run(line)
-
+
# insert a new blank line
bpy.ops.console.history_append(text="", current_character=0,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list