diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-09 13:15:47 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-09 13:17:31 +0400 |
commit | 375d2dc85535b9f08fd2e854c80434eac1c28a67 (patch) | |
tree | 9cb344ef18c86d8286abfb2933d37e98cc48754c /release | |
parent | fe9394741b7ac9ca153c602d6f58664b27438d56 (diff) |
Implement custom names for render slots
Basically the title tells it all, quite straightforward implementation.
The only thing is the image.render_slot which used to represent the active
render slot index is now moved to image.render_slots.active_index.
Reviewers: venomgfx, campbellbarton
Differential Revision: https://developer.blender.org/D821
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/presets/keyconfig/maya.py | 19 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 5 |
2 files changed, 13 insertions, 11 deletions
diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index 436541d85f8..29573e40d70 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -1419,32 +1419,29 @@ kmi = km.keymap_items.new('object.mode_set', 'TAB', 'PRESS') kmi.properties.mode = 'EDIT' kmi.properties.toggle = True kmi = km.keymap_items.new('wm.context_set_int', 'ONE', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 0 kmi = km.keymap_items.new('wm.context_set_int', 'TWO', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 1 kmi = km.keymap_items.new('wm.context_set_int', 'THREE', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 2 kmi = km.keymap_items.new('wm.context_set_int', 'FOUR', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 3 kmi = km.keymap_items.new('wm.context_set_int', 'FIVE', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 4 kmi = km.keymap_items.new('wm.context_set_int', 'SIX', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 5 kmi = km.keymap_items.new('wm.context_set_int', 'SEVEN', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 6 kmi = km.keymap_items.new('wm.context_set_int', 'EIGHT', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' +kmi.properties.data_path = 'space_data.image.render_slots.active_index' kmi.properties.value = 7 -kmi = km.keymap_items.new('wm.context_set_int', 'NINE', 'PRESS') -kmi.properties.data_path = 'space_data.image.render_slot' -kmi.properties.value = 8 # Map Node Editor km = kc.keymaps.new('Node Editor', space_type='NODE_EDITOR', region_type='WINDOW', modal=False) diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 927e517ef21..0b97a2dda28 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -661,6 +661,11 @@ class IMAGE_PT_view_properties(Panel): sub.active = uvedit.show_stretch sub.row().prop(uvedit, "draw_stretch_type", expand=True) + if ima: + layout.separator() + render_slot = ima.render_slots.active + layout.prop(render_slot, "name", text="Slot Name") + class IMAGE_PT_tools_transform_uvs(Panel, UVToolsPanel): bl_label = "Transform" |