diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 01:08:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 01:08:25 +0400 |
| commit | 0f28c1c27aec41dd22e31aac2c02cdfae785dd1b (patch) | |
| tree | 1c41b37d29a56390d810846cd7fe8f1218e40576 /release/scripts/modules | |
| parent | 9be40c026df54fee796c4073ebd4734c55ed5807 (diff) | |
| parent | 408f7963c5cfd65792d826390b01896282de8e97 (diff) | |
svn merge ^/trunk/blender -r43461:43472
Diffstat (limited to 'release/scripts/modules')
| -rw-r--r-- | release/scripts/modules/bpy_extras/keyconfig_utils.py | 1 | ||||
| -rw-r--r-- | release/scripts/modules/rna_xml.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index a9eb86aaf79..20b0669e531 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -70,6 +70,7 @@ KM_HIERARCHY = [ ('Image', 'IMAGE_EDITOR', 'WINDOW', [ ('UV Editor', 'EMPTY', 'WINDOW', []), # image (reverse order, UVEdit before Image ('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d + ('UV Sculpt', 'EMPTY', 'WINDOW', []), ('Image Generic', 'IMAGE_EDITOR', 'WINDOW', []) ]), diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index 634c74178fa..c39d904bf08 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -141,7 +141,7 @@ def rna2xml(fw=print_ln, return number_to_str(s, subsubvalue_type) else: return " ".join([str_recursive(si) for si in s]) - + array_value = " ".join(str_recursive(v) for v in subvalue_rna) node_attrs.append("%s=\"%s\"" % (prop, array_value)) @@ -308,13 +308,13 @@ def xml2rna(root_xml, rna2xml_node(root_xml, root_rna) - # ----------------------------------------------------------------------------- # Utility function used by presets. # The idea is you can run a preset like a script with a few args. # # This roughly matches the operator 'bpy.ops.script.python_file_run' + def _get_context_val(context, path): path_full = "context." + path try: @@ -328,6 +328,7 @@ def _get_context_val(context, path): return value + def xml_file_run(context, filepath, rna_map): import xml.dom.minidom |